security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

speedo: Do not not assume GNU tar.

Browse Source 
--
Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2014-11-05 08:56:52 +01:00
parent 6b54759976
commit 2402887584
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autogen.sh
View File

@ -202,12 +202,12 @@ if [ "$myhost" = "find-version" ]; then
case "$version_parts" in case "$version_parts" in
2) 2)
matchstr1="$package-$major.[0-9][0-9]*" matchstr1="$package-$major.[0-9]*"
matchstr2="$package-$major-base" matchstr2="$package-$major-base"
vers="$major.$minor" vers="$major.$minor"
;; ;;
*) *)
matchstr1="$package-$major.$minor.[0-9][0-9]*" matchstr1="$package-$major.$minor.[0-9]*"
matchstr2="$package-$major.$minor-base" matchstr2="$package-$major.$minor-base"
vers="$major.$minor.$micro" vers="$major.$minor.$micro"
;; ;;

19
build-aux/speedo.mk
View File

@ -421,11 +421,13 @@ speedo_pkg_gpa_configure = \
speedo_pkg_gpgex_configure = \ speedo_pkg_gpgex_configure = \
--with-gpg-error-prefix=$(idir) \ --with-gpg-error-prefix=$(idir) \
--with-libassuan-prefix=$(idir) --with-libassuan-prefix=$(idir) \
--enable-gpa-only
speedo_pkg_w64_gpgex_configure = \ speedo_pkg_w64_gpgex_configure = \
--with-gpg-error-prefix=$(idir6) \ --with-gpg-error-prefix=$(idir6) \
--with-libassuan-prefix=$(idir6) --with-libassuan-prefix=$(idir6) \
--enable-gpa-only
# #
@ -741,15 +743,16 @@ $(stampdir)/stamp-$(1)-00-unpack: $(stampdir)/stamp-directories
elif [ -n "$$$${tar}" ]; then \ elif [ -n "$$$${tar}" ]; then \
echo "speedo: unpacking $(1) from $$$${tar}"; \ echo "speedo: unpacking $(1) from $$$${tar}"; \
case "$$$${tar}" in \ case "$$$${tar}" in \
*.gz) opt=z ;; \ *.gz) pretar=zcat ;; \
*.bz2) opt=j ;; \ *.bz2) pretar=bzcat ;; \
*.xz) opt=J ;; \ *.xz) pretar=xzcat ;; \
*) opt= ;; \ *) pretar=cat ;; \
esac; \ esac; \
[ -f tmp.tgz ] && rm tmp.tgz; \ [ -f tmp.tgz ] && rm tmp.tgz; \
case "$$$${tar}" in \ case "$$$${tar}" in \
/*) tar x$$$${opt}f - < $$$${tar} ;; \ /*) $$$${pretar} < $$$${tar} | tar xf - ;; \
*) wget -q -O - $$$${tar} | tee tmp.tgz | tar x$$$${opt}f - ;; \ *) wget -q -O - $$$${tar} | tee tmp.tgz \
| $$$${pretar} | tar x$$$${opt}f - ;; \
esac; \ esac; \
if [ -f tmp.tgz ]; then \ if [ -f tmp.tgz ]; then \
if [ -n "$$$${sha1}" ]; then \ if [ -n "$$$${sha1}" ]; then \