Gentoo Archives: gentoo-commits

From: Yixun Lan <dlan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/autofs/, net-fs/autofs/files/
Date: Tue, 05 Jul 2016 23:22:07
Message-Id: 1467760809.1069c56a8946a005eadfaebc3c75ab6eceee1bed.dlan@gentoo
1 commit: 1069c56a8946a005eadfaebc3c75ab6eceee1bed
2 Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 5 23:19:20 2016 +0000
4 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 5 23:20:09 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1069c56a
7
8 net-fs/autofs: fix --as-need issue USE=libtirpc
9
10 thanks Martin von Gagern for reporting & the patch
11
12 http://wiki.gentoo.org/wiki/Project:Quality_Assurance/As-needed
13
14 Gentoo-Bug: 588106
15
16 Package-Manager: portage-2.3.0_rc1
17
18 net-fs/autofs/autofs-5.1.2.ebuild | 4 ++++
19 .../files/autofs-5.1.2-libtirpc-as-need.patch | 28 ++++++++++++++++++++++
20 2 files changed, 32 insertions(+)
21
22 diff --git a/net-fs/autofs/autofs-5.1.2.ebuild b/net-fs/autofs/autofs-5.1.2.ebuild
23 index 685e0bb..4fb3c61 100644
24 --- a/net-fs/autofs/autofs-5.1.2.ebuild
25 +++ b/net-fs/autofs/autofs-5.1.2.ebuild
26 @@ -47,6 +47,10 @@ DEPEND="${RDEPEND}
27
28 CONFIG_CHECK="~AUTOFS4_FS"
29
30 +PATCHES=(
31 + "${FILESDIR}"/${P}-libtirpc-as-need.patch
32 +)
33 +
34 src_prepare() {
35 # Upstream's patchset
36 if [[ -n ${PATCH_VER} ]]; then
37
38 diff --git a/net-fs/autofs/files/autofs-5.1.2-libtirpc-as-need.patch b/net-fs/autofs/files/autofs-5.1.2-libtirpc-as-need.patch
39 new file mode 100644
40 index 0000000..f6e1769
41 --- /dev/null
42 +++ b/net-fs/autofs/files/autofs-5.1.2-libtirpc-as-need.patch
43 @@ -0,0 +1,28 @@
44 +Make configure compatible with -Wl,--as-needed following
45 +https://wiki.gentoo.org/wiki/Project:Quality_Assurance/As-needed#Failure_in_..2Fconfigure
46 +
47 +2016-07-05 Martin von Gagern
48 +
49 +--- autofs-5.1.2.orig/aclocal.m4
50 ++++ autofs-5.1.2/aclocal.m4
51 +@@ -413,9 +413,9 @@ AC_DEFUN([AF_CHECK_LIBTIRPC],
52 + [
53 + # save current flags
54 + af_check_libtirpc_save_cflags="$CFLAGS"
55 +-af_check_libtirpc_save_ldflags="$LDFLAGS"
56 ++af_check_libtirpc_save_libs="$LIBS"
57 + CFLAGS="$CFLAGS -I/usr/include/tirpc"
58 +-LDFLAGS="$LDFLAGS -ltirpc"
59 ++LIBS="$LIBS -ltirpc"
60 +
61 + AC_TRY_LINK(
62 + [ #include <rpc/rpc.h> ],
63 +@@ -438,7 +438,7 @@ AC_CHECK_FUNCS([getrpcbyname getservbyna
64 +
65 + # restore flags
66 + CFLAGS="$af_check_libtirpc_save_cflags"
67 +-LDFLAGS="$af_check_libtirpc_save_ldflags"
68 ++LIBS="$af_check_libtirpc_save_libs"
69 + ])
70 +
71 + AC_DEFUN([AF_WITH_LIBTIRPC],