[Libreoffice-commits] .: solenv/gbuild

[Caolán McNamara]

 solenv/gbuild/ExternalLib.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c4e70e2edb9a6f870a3826264a5596e50bf7e919
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Oct 1 16:50:14 2011 +0100

    get libcmis building, To-Do hack rpath to our desired fooORIGINfoo one

diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk
index cee876f..142968f 100644
--- a/solenv/gbuild/ExternalLib.mk
+++ b/solenv/gbuild/ExternalLib.mk
@@ -99,6 +99,8 @@ define gb_ExternalLib__command_autotools
 	pushd $(call gb_ExternalLib_get_builddir,$(1)) && for p in $(T_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$$p || exit 1; done && \
 	CC="$(gb_CC)" CXX="$(gb_CXX)" CFLAGS="$(T_CFLAGS)" CXXFLAGS="$(T_CXXFLAGS)" ./configure --prefix=$(OUTDIR) $(T_CONF_ARGS) && \
 	for p in $(T_POST_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$p || exit 1; done
+	#we don't want a deployed rpath pointing into our solver, to-do, set correct ORIGIN-foo ?
+	pushd $(call gb_ExternalLib_get_builddir,$(1)) && if test -e libtool ; then sed -i 's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec="",g' libtool && sed -i 's,^runpath_var=LD_RUN_PATH,runpath_var=DIE_RPATH_DIE,g' libtool; fi
 	+MAKEFLAGS=$(filterout r,$(MAKEFLAGS)) $(MAKE) -C $(call gb_ExternalLib_get_builddir,$(1))
 	+$(MAKE) -C $(call gb_ExternalLib_get_builddir,$(1)) install
 endef