diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-21 17:23:29 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-21 21:28:49 +0200 |
| commit | 356536956bb7d6958b942259cf231b25fa89b7cd (patch) | |
| tree | 5c5ba55305a665d1901c73a518fe6f64c86ab571 /solenv | |
| parent | 728ad64ad38334158fd2d82de65823ea79a3e08e (diff) | |
kill multi repo support: ExternalLib
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/ExternalLib.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk index 90763f441abe..c0cff41b6148 100644 --- a/solenv/gbuild/ExternalLib.mk +++ b/solenv/gbuild/ExternalLib.mk @@ -26,8 +26,6 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -gb_ExternalLib_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES) - gb_ExternalLib_get_src_package = $(TARFILE_LOCATION)/$(1) define gb_ExternalLib_ExternalLib @@ -102,9 +100,9 @@ define gb_ExternalLib__command_autotools rm -fr $(call gb_ExternalLib_get_workdir,$(1)) && \ mkdir -p $(call gb_ExternalLib_get_builddir,$(1)) && \ $(GNUTAR) -x -C $(call gb_ExternalLib_get_builddir,$(1)) --strip-component=1 -f $< && \ - cd $(call gb_ExternalLib_get_builddir,$(1)) && for p in $(T_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$$p || exit 1; done && \ + cd $(call gb_ExternalLib_get_builddir,$(1)) && for p in $(T_PATCHES) ; do patch -p 1 < $(SOLARSRC)/$$p || exit 1; done && \ CC="$(gb_CC)" CXX="$(gb_CXX)" CFLAGS="$(T_CFLAGS)" CXXFLAGS="$(T_CXXFLAGS)" PKG_CONFIG_PATH="$(PKG_CONFIG_PATH) $(OUTDIR)/lib/pkgconfig" ./configure $(if $(findstring YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) --prefix=$(OUTDIR) $(T_CONF_ARGS) && \ - for p in $(T_POST_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$p || exit 1; done + for p in $(T_POST_PATCHES) ; do patch -p 1 < $(SOLARSRC)/$p || exit 1; done #we don't want a deployed rpath pointing into our solver, to-do, set correct ORIGIN-foo ? cd $(call gb_ExternalLib_get_builddir,$(1)) && if test -e libtool ; then sed -i -e 's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec="",g' libtool && sed -i -e '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)) |