diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-03-23 13:16:00 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-03-23 13:16:20 +0100 |
| commit | a565276f66c916198dbcc70950330db292177dfc (patch) | |
| tree | 6efede4f841ce63b43ea4a19136da9befc7d5450 | |
| parent | c9550dc7f318d05769a6e6a25a5138799e76b1e6 (diff) | |
Enable use of older tars that uses --strip-path to strip components
| -rw-r--r-- | clucene/source/Makefile | 2 | ||||
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.in | 18 |
3 files changed, 20 insertions, 1 deletions
diff --git a/clucene/source/Makefile b/clucene/source/Makefile index 74350ea13c69..1db25cf9f0a0 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-components=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/config_host.mk.in b/config_host.mk.in index a018a1bd2fd9..945e1302f084 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -434,6 +434,7 @@ export STARTCENTER_RTL_LEFT_BITMAP=@STARTCENTER_RTL_LEFT_BITMAP@ export STARTCENTER_RTL_RIGHT_BITMAP=@STARTCENTER_RTL_RIGHT_BITMAP@ export STARTCENTER_SPACE_BITMAP=@STARTCENTER_SPACE_BITMAP@ export STRIP=@STRIP@ +export STRIP_COMPONENTS=@STRIP_COMPONENTS@ export SUNTEMPLATES_DE_PACK=@SUNTEMPLATES_DE_PACK@ export SUNTEMPLATES_EN_US_PACK=@SUNTEMPLATES_EN_US_PACK@ export SUNTEMPLATES_ES_PACK=@SUNTEMPLATES_ES_PACK@ diff --git a/configure.in b/configure.in index 3f084e62d03b..065c1357a851 100644 --- a/configure.in +++ b/configure.in @@ -2034,6 +2034,24 @@ if test -z "$GNUTAR"; then fi AC_SUBST(GNUTAR) +AC_MSG_CHECKING([for tar's option to strip components]) +$GNUTAR --help 2> /dev/null | egrep "strip-components" 2>&1 >/dev/null +if test $? -eq 0; then + STRIP_COMPONENTS="--strip-components" +else + $GNUTAR --help 2> /dev/null | egrep "strip-path" 2>&1 >/dev/null + if test $? -eq 0; then + STRIP_COMPONENTS="--strip-path" + else + STRIP_COMPONENTS="unsupported" + fi +fi +AC_MSG_RESULT($STRIP_COMPONENTS) +if test x$STRIP_COMPONENTS == xunsupported; then + AC_MSG_ERROR([you need a tar that is able to strip components.]) +fi +AC_SUBST(STRIP_COMPONENTS) + dnl It is useful to have a BUILD_TYPE keyword to distinguish "normal" dnl desktop OSes from "mobile" ones. |