Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/rpcsvc-proto/files/
Date: Thu, 21 May 2020 08:22:57
Message-Id: 1590049364.64cd87f5a8fe6e37c9195fa58c487b1e452ab9b9.slyfox@gentoo
1 commit: 64cd87f5a8fe6e37c9195fa58c487b1e452ab9b9
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed May 20 15:34:31 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Thu May 21 08:22:44 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64cd87f5
7
8 net-libs/rpcsvc-proto: remove unused patch(es)
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
13
14 .../files/rpcsvc-proto-1.4-external-libintl.patch | 47 ----------------------
15 1 file changed, 47 deletions(-)
16
17 diff --git a/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.4-external-libintl.patch b/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.4-external-libintl.patch
18 deleted file mode 100644
19 index a5088735bbb..00000000000
20 --- a/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.4-external-libintl.patch
21 +++ /dev/null
22 @@ -1,47 +0,0 @@
23 -From 2527c37f956aa38408e251587556a6c8389af319 Mon Sep 17 00:00:00 2001
24 -From: Sergei Trofimovich <slyfox@g.o>
25 -Date: Sun, 29 Dec 2019 23:38:28 +0000
26 -Subject: [PATCH] configure.ac: autodetect need for external libintl
27 -
28 -uclibc-ng and macos standard libraries don't provide libintl
29 -facilities. As a result build fails as
30 -(x86_64-gentoo-linux-uclibc example):
31 -
32 -```
33 -...
34 -gcc -g -O2 -o rpcgen rpc_clntout.o rpc_cout.o rpc_hout.o rpc_main.o rpc_parse.o rpc_sample.o rpc_scan.o rpc_svcout.o rpc_tblout.o rpc_util.o
35 -/usr/lib/gcc/x86_64-gentoo-linux-uclibc/9.2.0/../../../../x86_64-gentoo-linux-uclibc/bin/ld: rpc_main.o: in function `usage':
36 -/root/rpcsvc-proto/rpcgen/rpc_main.c:1403: undefined reference to `libintl_gettext'
37 -/usr/lib/gcc/x86_64-gentoo-linux-uclibc/9.2.0/../../../../x86_64-gentoo-linux-uclibc/bin/ld: /root/rpcsvc-proto/rpcgen/rpc_main.c:1404: undefined reference to `libintl_gettext'
38 -...
39 -```
40 -
41 -The change is simple: add gettext m4 macros to detect need
42 -for libintl and link to an external library if needed.
43 -
44 -Tested on x86_64-glibc and x86_64-uclibc-ng.
45 -
46 -Reported-by: Anton
47 -Bug: https://bugs.gentoo.org/637084
48 -Signed-off-by: Sergei Trofimovich <slyfox@g.o>
49 -
50 ---- a/configure.ac
51 -+++ b/configure.ac
52 -@@ -16,4 +16,7 @@ AC_ISC_POSIX
53 - AC_PROG_INSTALL
54 - AC_PROG_MAKE_SET
55 -
56 -+AM_GNU_GETTEXT([external])
57 -+AM_GNU_GETTEXT_VERSION([0.18.1])
58 -+
59 - AC_OUTPUT([Makefile rpcgen/Makefile rpcsvc/Makefile])
60 ---- a/rpcgen/Makefile.am
61 -+++ b/rpcgen/Makefile.am
62 -@@ -10,3 +10,4 @@ noinst_HEADERS = proto.h rpc_parse.h rpc_scan.h rpc_util.h
63 - rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
64 - rpc_parse.c rpc_sample.c rpc_scan.c rpc_svcout.c rpc_tblout.c \
65 - rpc_util.c
66 -+rpcgen_LDADD = $(LIBINTL)
67 ---
68 -2.24.1
69 -