mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable use of older tars that uses --strip-path to strip components

Browse Source
This commit is contained in:
Fridrich Štrba
2012-03-23 13:16:00 +01:00
parent c9550dc7f3
commit a565276f66
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
clucene/source/Makefile
View File

@@ -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

1
config_host.mk.in
View File

@@ -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@

18
configure.in
View File

@@ -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.