summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2017-09-25 12:38:37 +0200
committerAndreas K. Hüttel <dilfridge@gentoo.org>2017-11-01 23:04:47 +0100
commitc2585aef6d159695ac0a5dc600245507973e82ef (patch)
treed57f37e7f34b1e21cb39b528220037bd138daf2e /net-analyzer/argus/files
parentdev-perl/Module-Build-XSUtil: Bump to version 0.180.0 (diff)
downloadgentoo-c2585aef6d159695ac0a5dc600245507973e82ef.tar.gz
gentoo-c2585aef6d159695ac0a5dc600245507973e82ef.tar.bz2
gentoo-c2585aef6d159695ac0a5dc600245507973e82ef.zip
net-analyzer/argus: Add option to build against libtirpc for RPC support, bug 631474
Closes: https://bugs.gentoo.org/631474 Package-Manager: Portage-2.3.10, Repoman-2.3.3
Diffstat (limited to 'net-analyzer/argus/files')
-rw-r--r--net-analyzer/argus/files/argus-3.0.8.2-rpc.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch b/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch
new file mode 100644
index 000000000000..462d465609f1
--- /dev/null
+++ b/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch
@@ -0,0 +1,47 @@
+diff -ruN argus-3.0.8.2.orig/common/Makefile.in argus-3.0.8.2/common/Makefile.in
+--- argus-3.0.8.2.orig/common/Makefile.in 2015-04-14 14:32:33.000000000 -0000
++++ argus-3.0.8.2/common/Makefile.in 2017-09-25 10:27:16.272856331 -0000
+@@ -35,12 +35,12 @@
+
+ CC = @CC@
+ CCOPT = @V_CCOPT@
+-INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include -I$(srcdir)/../argus
++INCLS = -I$(srcdir) @V_INCLS@ @RPC_CFLAGS@ -I$(srcdir)/../include -I$(srcdir)/../argus
+ DEFS = @DEFS@
+
+ # Standard CFLAGS
+ CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ @RPC_LIBS@
+
+ INSTALL = @INSTALL@
+ RANLIB = @V_RANLIB@
+diff -ruN argus-3.0.8.2.orig/configure.ac argus-3.0.8.2/configure.ac
+--- argus-3.0.8.2.orig/configure.ac 2017-09-25 10:20:04.155174606 -0000
++++ argus-3.0.8.2/configure.ac 2017-09-25 10:24:39.151904377 -0000
+@@ -120,6 +120,25 @@
+ AC_CHECK_FUNCS(floorf remainderf)
+ AC_CHECK_FUNCS(timegm)
+
++AC_ARG_WITH([libtirpc],
++ AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
++ [], [ with_libtirpc=no ])
++
++AS_IF([test "x$with_libtirpc" != xno],
++ [PKG_CHECK_MODULES([TIRPC],
++ [libtirpc],
++ [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
++ [AC_MSG_ERROR([libtirpc requested, but library not found.])]
++ )],
++ [AC_CHECK_HEADER(rpc/rpc.h,
++ [RPC_CFLAGS=""; RPC_LIBS="";],
++ [AC_MSG_ERROR([sunrpc requested, but headers are not present.])]
++ )]
++)
++
++AC_SUBST(RPC_CFLAGS)
++AC_SUBST(RPC_LIBS)
++
+ AC_CHECK_FUNCS(xdrmem_create)
+ if test "$ac_cv_func_xdrmem_create" = yes ; then
+ AC_DEFINE([HAVE_XDR], [], [Using system XDR library])