| 1 |
vapier 11/09/02 20:08:25 |
| 2 |
|
| 3 |
Added: rpcbind-0.2.0-pkgconfig.patch |
| 4 |
Log: |
| 5 |
Add pkg-config patch from upstream. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-nds/rpcbind/files/rpcbind-0.2.0-pkgconfig.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/rpcbind/files/rpcbind-0.2.0-pkgconfig.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nds/rpcbind/files/rpcbind-0.2.0-pkgconfig.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: rpcbind-0.2.0-pkgconfig.patch |
| 16 |
=================================================================== |
| 17 |
From afd71b8fc0df036a884b3af14ddb875674a49a85 Mon Sep 17 00:00:00 2001 |
| 18 |
From: =?UTF-8?q?Diego=20Elio=20Petten=F2?= <flameeyes@×××××.com> |
| 19 |
Date: Mon, 29 Nov 2010 16:28:38 -0500 |
| 20 |
Subject: [PATCH] Use pkg-config to find libtirpc |
| 21 |
MIME-Version: 1.0 |
| 22 |
Content-Type: text/plain; charset=UTF-8 |
| 23 |
Content-Transfer-Encoding: 8bit |
| 24 |
|
| 25 |
This allows to properly cross-compile rpcbind, as /usr/include/tirpc is |
| 26 |
no longer a valid path in that case. |
| 27 |
|
| 28 |
Signed-off-by: Diego Elio Pettenò <flameeyes@×××××.com> |
| 29 |
Signed-off-by: Steve Dickson <steved@××××××.com> |
| 30 |
--- |
| 31 |
configure.in | 4 +++- |
| 32 |
src/Makefile.am | 13 +++++++------ |
| 33 |
2 files changed, 10 insertions(+), 7 deletions(-) |
| 34 |
|
| 35 |
diff --git a/configure.in b/configure.in |
| 36 |
index de1c730..7d43fd4 100644 |
| 37 |
--- a/configure.in |
| 38 |
+++ b/configure.in |
| 39 |
@@ -51,7 +51,9 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h \ |
| 40 |
unistd.h nss.h]) |
| 41 |
|
| 42 |
AC_CHECK_LIB([pthread], [pthread_create]) |
| 43 |
-AC_CHECK_LIB([tirpc], [clnt_create]) |
| 44 |
+ |
| 45 |
+PKG_CHECK_MODULES([TIRPC], [libtirpc]) |
| 46 |
+ |
| 47 |
AC_ARG_ENABLE(libwrap,[ --enable-libwrap Enables host name checking], |
| 48 |
[case "${enableval}" in |
| 49 |
yes) libwarp=true |
| 50 |
diff --git a/src/Makefile.am b/src/Makefile.am |
| 51 |
index cc0a85b..a2f3e34 100644 |
| 52 |
--- a/src/Makefile.am |
| 53 |
+++ b/src/Makefile.am |
| 54 |
@@ -1,4 +1,4 @@ |
| 55 |
-INCLUDES = -I$(srcdir)/tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \ |
| 56 |
+INCLUDES = $(TIRPC_CFLAGS) -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \ |
| 57 |
-D_GNU_SOURCE -Wall -pipe |
| 58 |
if DEBUG |
| 59 |
INCLUDES += -DRPCBIND_DEBUG -DSVC_RUN_DEBUG -DDEBUG_RMTCALL |
| 60 |
@@ -23,12 +23,13 @@ rpcbind_SOURCES = check_bound.c rpcbind.c \ |
| 61 |
rpcbind.h |
| 62 |
|
| 63 |
rpcinfo_SOURCES = rpcinfo.c |
| 64 |
-rpcinfo_LDFLAGS = -lpthread -ltirpc |
| 65 |
-rpcinfo_LDADD = $(LIB_TIRPC) |
| 66 |
+rpcinfo_LDFLAGS = -lpthread |
| 67 |
+rpcinfo_LDADD = $(TIRPC_LIBS) |
| 68 |
|
| 69 |
|
| 70 |
-rpcbind_LDFLAGS = -lpthread -ltirpc |
| 71 |
-rpcbind_LDADD = $(LIB_TIRPC) |
| 72 |
-AM_CPPFLAGS = -I/usr/include/tirpc -DCHECK_LOCAL -DPORTMAP \ |
| 73 |
+rpcbind_LDFLAGS = -lpthread |
| 74 |
+rpcbind_CFLAGS = $(TIRPC_CFLAGS) |
| 75 |
+rpcbind_LDADD = $(TIRPC_LIBS) |
| 76 |
+AM_CPPFLAGS = -DCHECK_LOCAL -DPORTMAP \ |
| 77 |
-DFACILITY=LOG_MAIL -DSEVERITY=LOG_INFO |
| 78 |
|
| 79 |
-- |
| 80 |
1.7.6 |
Archives