diff options
| author | Korrawit Pruegsanusak <detective.conan.1412@gmail.com> | 2012-03-13 18:38:37 +0700 |
|---|---|---|
| committer | Korrawit Pruegsanusak <detective.conan.1412@gmail.com> | 2012-03-13 18:38:37 +0700 |
| commit | 380f0af0a814fdb2aaaee44aaef0bc035c8ede85 (patch) | |
| tree | 2e0e8d52253c570ca93e4b7cd0570514417cefad | |
| parent | 41b52a106f84dd61d8d7bdc785d0a7402a584a8c (diff) | |
gtar actually expects --strip-components, with trailing 's'
| -rw-r--r-- | clucene/source/Makefile | 2 | ||||
| -rw-r--r-- | solenv/gbuild/ExternalLib.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/clucene/source/Makefile b/clucene/source/Makefile index f3826ee68436..74350ea13c69 100644 --- a/clucene/source/Makefile +++ b/clucene/source/Makefile @@ -38,7 +38,7 @@ endif done : mkdir -p $(dir $@) # FIXME: do not hardcode the path here - $(GNUTAR) -x --strip-component=1 -f $(FIXED_TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz + $(GNUTAR) -x --strip-components=1 -f $(FIXED_TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-internal-zlib.patch $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-warnings.patch $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-gcc-atomics.patch diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk index 4fe079361c22..cb8eb017659b 100644 --- a/solenv/gbuild/ExternalLib.mk +++ b/solenv/gbuild/ExternalLib.mk @@ -99,7 +99,7 @@ endef 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 $< && \ + $(GNUTAR) -x -C $(call gb_ExternalLib_get_builddir,$(1)) --strip-components=1 -f $< && \ cd $(call gb_ExternalLib_get_builddir,$(1)) && for p in $(T_PATCHES) ; do patch -p 1 < $(SRCDIR)/$$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 < $(SRCDIR)/$p || exit 1; done |