Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/autogen/files/, sys-devel/autogen/
Date: Wed, 21 Nov 2018 22:34:23
Message-Id: 1542839646.7baf80d18d840c764a49035f4a9b7b2ae8723b50.slyfox@gentoo
1 commit: 7baf80d18d840c764a49035f4a9b7b2ae8723b50
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 21 20:22:02 2018 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 21 22:34:06 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7baf80d1
7
8 sys-devel/autogen: avoid running autoreconf
9
10 It's not a fix of bug #671616 but a step in
11 direction when result does not depend on presence of autoconf.
12
13 Not I get install failure described in the bug consistently.
14
15 Bug: https://bugs.gentoo.org/671616
16 Package-Manager: Portage-2.3.52, Repoman-2.3.12
17 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
18
19 sys-devel/autogen/autogen-5.18.16.ebuild | 12 ++++++++++++
20 sys-devel/autogen/files/autogen-5.18.16-no-werror.patch | 12 ++++++------
21 2 files changed, 18 insertions(+), 6 deletions(-)
22
23 diff --git a/sys-devel/autogen/autogen-5.18.16.ebuild b/sys-devel/autogen/autogen-5.18.16.ebuild
24 index fc70a815c93..c3f3fedf69a 100644
25 --- a/sys-devel/autogen/autogen-5.18.16.ebuild
26 +++ b/sys-devel/autogen/autogen-5.18.16.ebuild
27 @@ -22,6 +22,18 @@ PATCHES=(
28 "${FILESDIR}"/${PN}-5.18.16-no-werror.patch
29 )
30
31 +src_prepare() {
32 + # no-werror.patch fixes both configure{.ac,}
33 + # avoid configure echeck
34 + touch -r configure.ac orig.configure.ac || die
35 + touch -r configure orig.configure || die
36 +
37 + default
38 +
39 + touch -r orig.configure.ac configure.ac || die
40 + touch -r orig.configure configure || die
41 +}
42 +
43 src_configure() {
44 # suppress possibly incorrect -R flag
45 export ag_cv_test_ldflags=
46
47 diff --git a/sys-devel/autogen/files/autogen-5.18.16-no-werror.patch b/sys-devel/autogen/files/autogen-5.18.16-no-werror.patch
48 index 7f9f36428e1..ee8245ca8ac 100644
49 --- a/sys-devel/autogen/files/autogen-5.18.16-no-werror.patch
50 +++ b/sys-devel/autogen/files/autogen-5.18.16-no-werror.patch
51 @@ -1,13 +1,13 @@
52 ---- a/configure
53 -+++ b/configure
54 -@@ -18926,3 +18926,3 @@ test "X${GCC}" = Xyes && {
55 +--- a/configure.ac
56 ++++ b/configure.ac
57 +@@ -200,3 +200,3 @@ test "X${GCC}" = Xyes && {
58 CFLAGS="$CFLAGS -Wno-format-contains-nul -fno-strict-aliasing"
59 - WARN_CFLAGS="$CFLAGS "`echo -Wall -Werror -Wcast-align -Wmissing-prototypes \
60 + WARN_CFLAGS="$CFLAGS "`echo -Wall -Wcast-align -Wmissing-prototypes \
61 -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
62 ---- a/configure.ac
63 -+++ b/configure.ac
64 -@@ -200,3 +200,3 @@ test "X${GCC}" = Xyes && {
65 +--- a/configure
66 ++++ b/configure
67 +@@ -18926,3 +18926,3 @@ test "X${GCC}" = Xyes && {
68 CFLAGS="$CFLAGS -Wno-format-contains-nul -fno-strict-aliasing"
69 - WARN_CFLAGS="$CFLAGS "`echo -Wall -Werror -Wcast-align -Wmissing-prototypes \
70 + WARN_CFLAGS="$CFLAGS "`echo -Wall -Wcast-align -Wmissing-prototypes \