1 |
commit: ca08ed2aea1532dfd3d970f5a657abfc9e9e6f6f |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 30 09:50:39 2019 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 30 10:09:29 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=ca08ed2a |
7 |
|
8 |
make-tarball: update/fix for latest autotools build |
9 |
|
10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
11 |
|
12 |
make-tarball.sh | 31 +++++++++++++------------------ |
13 |
1 file changed, 13 insertions(+), 18 deletions(-) |
14 |
|
15 |
diff --git a/make-tarball.sh b/make-tarball.sh |
16 |
index 2052985..489ce4b 100755 |
17 |
--- a/make-tarball.sh |
18 |
+++ b/make-tarball.sh |
19 |
@@ -1,8 +1,8 @@ |
20 |
-#!/bin/bash |
21 |
+#!/bin/env bash |
22 |
|
23 |
set -e |
24 |
|
25 |
-if ! . /etc/init.d/functions.sh 2>/dev/null ; then |
26 |
+if ! . ${EPREFIX}/lib/gentoo/functions.sh 2>/dev/null ; then |
27 |
einfo() { printf ' * %b\n' "$*"; } |
28 |
eerror() { einfo "$@" 1>&2; } |
29 |
fi |
30 |
@@ -26,38 +26,32 @@ git) ver="HEAD" ;; |
31 |
fi |
32 |
;; |
33 |
esac |
34 |
-p="portage-utils-${ver#v}" |
35 |
+p="${TMPDIR:-/var/tmp}/portage-utils-${ver#v}" |
36 |
|
37 |
rm -rf "${p}" |
38 |
mkdir "${p}" |
39 |
|
40 |
einfo "Checking out clean git sources ..." |
41 |
git archive "${ver}" | tar xf - -C "${p}" |
42 |
-cd "${p}" |
43 |
+pushd "${p}" >/dev/null |
44 |
|
45 |
einfo "Building autotools ..." |
46 |
sed -i "/^AC_INIT/s:git:${ver#v}:" configure.ac |
47 |
sed -i "/^AM_MAINTAINER_MODE/s:(.*)$::" configure.ac |
48 |
-sed -i "1iPV := ${ver#v}" Makefile |
49 |
-LC_ALL=C ${MAKE} -s autotools >/dev/null |
50 |
+./autogen.sh |
51 |
rm -rf autom4te.cache |
52 |
-cd .. |
53 |
+popd >/dev/null |
54 |
|
55 |
einfo "Generating tarball ..." |
56 |
-tar --numeric-owner -cf - "${p}" | xz > "${p}".tar.xz |
57 |
+pushd "${p%/*}" >/dev/null |
58 |
+tar --numeric-owner -cf - "${p##*/}" | xz > "${p}".tar.xz |
59 |
+popd >/dev/null |
60 |
rm -r "${p}" |
61 |
-du -b "${p}".tar.* |
62 |
|
63 |
-einfo "Checking tarball (simple) ..." |
64 |
+einfo "Checking tarball ..." |
65 |
+pushd "${p%/*}" >/dev/null |
66 |
tar xf "${p}".tar.* |
67 |
-pushd "${p}" >/dev/null |
68 |
-v ${MAKE} -s |
69 |
-v ${MAKE} -s check |
70 |
popd >/dev/null |
71 |
-rm -rf "${p}" |
72 |
- |
73 |
-einfo "Checking tarball (autotools) ..." |
74 |
-tar xf "${p}".tar.* |
75 |
pushd "${p}" >/dev/null |
76 |
v ./configure -q |
77 |
v ${MAKE} -s |
78 |
@@ -67,6 +61,7 @@ rm -rf "${p}" |
79 |
|
80 |
echo |
81 |
einfo "All ready for distribution!" |
82 |
-du -b "${p}".tar.* |
83 |
+mv "${p}".tar.* . |
84 |
+du -b "${p##*/}".tar.* |
85 |
|
86 |
exit 0 |