Intermediate commit: Compilation works, but it errors out at link time.

2018-07-13 01:35:01 +02:00 · 2018-07-13 01:35:01 +02:00 · da80bcfd6a
commit da80bcfd6a
parent f5a9aaa642
3 changed files with 203 additions and 2 deletions
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@ -1,8 +1,9 @@
+AUX 01-3.7.2-use-tirpc-instead-of-sunrpc.patch 6745 BLAKE2B 3099441ac39935c2bff5640999f98c0aa58d00d376c9901e77b1a13259a622149ff5d3c6656fa274eeea3727afe301c101df1f2fac0a30c6c8ec40c64c8df776 SHA512 e25ec9717f5d4614ceb54bff75235be7cf2c9c6667880a08a72e771385579479eae00c7a4ffc34f9eb8c2e9db6d9059ddcff09f5e9e9553fc3f6adfda3d34687
 AUX gmetad-python.rc 618 BLAKE2B 476915bff06395d3451d256f4fef3d4a2aa96c866b9cae5227d19f60ecbffce0dc2e7f4513726564bff808ea3b2bd109ee8daff10975e9b1043f97733accc608 SHA512 1b23e84c453b0cd0aca8b340c9764adb79bccbc0b4a9574a1e5c7299bc8d497d30a2a56e9b855d3cda2664a856b404f4f6941b3feddbec889e45a59c92c05389
 AUX gmetad.rc 352 BLAKE2B 68629711870d52a198ae474b77ab7828987c2ac19551243063272ec50c61c3e0b2d32a08633ff878e3319a80f9bbc111ac5e7507c88164ea4ddb8244a0b9e41f SHA512 865e1f8622ebcf1103f0cb72ebc2d675af01e9ea0861fd43107ac2bca10d9e86f875741ae4cc1dabf0eb231fd3f907066974d82b245f2746acbad0f7eafb46af
 AUX gmetad.rc-2 480 BLAKE2B 9ebf71eca6c80aa5f5c776e292cc0ceee58103a30a7aad29e7430f766a58e6c58222113bc12bc7ddc74c4c3f6f5aaccc95ff7470321bbd3ccb87af1e704be7ae SHA512 37678fe9b52ce7c6ef38bcc764189ed26e10410567ac9a8608460ac3eab380c70ac91453ed425ffef8d6e86ff6ef609e0167f5bb04a2aa9318725527d31391fa
 AUX gmond.rc 346 BLAKE2B 8930fe96692c100de0feed00fbe1d5f39c3d6f9679f88ef0326b1c6b7cf6408ddba2d909027577299f5d063f765f9c9ddb26c96b0582b79b50f528ac2bffaba2 SHA512 0d1d4da1bfc2c20ae741fb9a7ee2e649780254029c50fee866f1fffdb55fddbd61ea3ead6670d7a65489d780990e24c6743c14bc1a4a7040b84972f4884629ca
 AUX gmond.rc-2 473 BLAKE2B 461d0b481f2138dcab8f7202a880354740b71f91e41ad2152a3465daf8072e6243fcc5f27ee215aa079dad30546e06146c01be71e85f518974cd9c479549ff34 SHA512 bbb5e3c525137aa2072bd46d28473523498895eba70c8dad1209230ea5e7f44ddc09875b5b6065fd5351d89ed0ad574a94fe0debcbe1d3a51e2541715adb4240
 DIST ganglia-3.7.2.tar.gz 1302320 BLAKE2B aee647d6ec4b2852536769773dd54d7a7e9ca33c05de4316172d530aee549207bdfa59f25e8fe456ae4c01a1af9eca3846f30242c64e7d9fe393687a7203eb12 SHA512 a88955e59421a447e5752a9bfe5f599d989a7a5a0141141ab3601d1ab250be4eebbede8bcef8baa151b2f9deaf3f56e30aef8ea709f3cc820a79fa3d3961e0df
-EBUILD ganglia-3.7.2.ebuild 2933 BLAKE2B ce04bee04d324b3633017cc4d05973ed66118fd82f9f2c9b874acbc35ce3c02d0a8eee80f1e09fdfdc2be03876b2433c7885f4550b88e229fe940a49d28835c7 SHA512 d632e9527a8d356f7515a9dc5fd68f616f21dd611c4629bc6463179c754a4e25b24abfdd591441138a70f45d18c17ecd3c7e3a562879374185b52bbf86546ab1
+EBUILD ganglia-3.7.2.ebuild 3041 BLAKE2B 0aa4dd49dcb9e10120717302ff4f9e09b2e8e9c0fd17021294ed5fcd163b9c69f4df99dd7d542819013d156c23dd40375f040acb6f71e9138f093731b73907ca SHA512 3717a4c024f1dfbb570a81a583c8dba91388abbffc5af82738739fcfeccc499b3448e335e1a313ca142cf8e9d02424fe8b8665454ea1d2b18bae8cbe6672bc85
 MISC metadata.xml 325 BLAKE2B 71ac60956aa877d76ec897fa1c07082c2b0d8d18db7e9d17248e3c730def736b5a70ffdf371d0d4d38aba338efc0689d5cb24dd08c084934e4d23914da48fc4f SHA512 c3cc85ba47cd58ccba2a511b1bcdac2de4cd40b69bc005935291c9394bde3ed55ce14d57d0c3ab0bc188b5116192f0851cb1be3e4eaeb190555e50920fcdb4fb
--- a/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch
+++ b/sys-cluster/ganglia/files/01-3.7.2-use-tirpc-instead-of-sunrpc.patch
@ -0,0 +1,196 @@
+diff --git a/Makefile.am b/Makefile.am
+index 95d0807..105222b 100644
+--- a/Makefile.am
+++ b/Makefile.am
+@@ -9,7 +9,7 @@ GMETAD_SUBDIR =
+ endif
+ 
+ EXTRA_SUBDIRS = "gmetad-python contrib solaris"
+-INCLUDES = @APR_INCLUDES@
+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ 
+ AUTOMAKE_OPTIONS = dist-bzip2 dist-tarZ dist-zip
+ ACLOCAL_AMFLAGS = -I m4
+diff --git a/configure.ac b/configure.ac
+index fe7983b..984c70b 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -606,13 +606,13 @@ AC_CHECK_HEADER([sys/mount.h], [], [],
+ #endif
+ ])
+ 
+-AC_CHECK_HEADERS(rpc/types.h)
+-AC_CHECK_HEADER([rpc/xdr.h], [],
+-   [AC_MSG_ERROR([your system is missing the Sun RPC (ONC/RPC) libraries])],
+-[#ifdef HAVE_RPC_TYPES_H
+-# include <rpc/types.h>
+-#endif
+-])
+PKG_CHECK_MODULES([TIRPC],
+                  [libtirpc],
+                  [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
+                  [AC_MSG_ERROR([libtirpc requested, but library not found.])]
+)
+AC_SUBST(RPC_CFLAGS)
+AC_SUBST(RPC_LIBS)
+ 
+ dnl ##################################################################
+ dnl Checks for typedefs.
+diff --git a/gmetad/Makefile.am b/gmetad/Makefile.am
+index 0a4e360..874d448 100644
+--- a/gmetad/Makefile.am
+++ b/gmetad/Makefile.am
+@@ -11,7 +11,7 @@ GLDADD =
+ GLDFLAGS = 
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ AM_CFLAGS = -I$(top_builddir)/lib -I$(top_builddir)/gmond -I$(top_builddir)/libmetrics -I$(top_builddir)/include $(GCFLAGS) @PROTOBUF_C_CFLAGS@
+ 
+ sbin_PROGRAMS = gmetad
+diff --git a/gmetric/Makefile.am b/gmetric/Makefile.am
+index bc7807c..d9bf585 100644
+--- a/gmetric/Makefile.am
+++ b/gmetric/Makefile.am
+@@ -10,7 +10,7 @@ GLDADD =
+ GLDFLAGS = 
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ 
+ AM_CFLAGS = -I../lib -I../include $(GCFLAGS)
+ 
+diff --git a/gmond/Makefile.am b/gmond/Makefile.am
+index 256fee3..d6f5f07 100644
+--- a/gmond/Makefile.am
+++ b/gmond/Makefile.am
+@@ -44,7 +44,7 @@ if BUILD_SFLOW
+ GCFLAGS += -DSFLOW
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ AM_CFLAGS = -I$(top_builddir)/lib -I$(top_builddir)/include/ -I$(top_builddir)/libmetrics $(GCFLAGS)
+ 
+ sbin_PROGRAMS = gmond
+diff --git a/gmond/modules/cpu/Makefile.am b/gmond/modules/cpu/Makefile.am
+index fd7457e..99ddb83 100644
+--- a/gmond/modules/cpu/Makefile.am
+++ b/gmond/modules/cpu/Makefile.am
+@@ -25,4 +25,4 @@ modload_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ 
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/disk/Makefile.am b/gmond/modules/disk/Makefile.am
+index 0c78689..2f5a2f0 100644
+--- a/gmond/modules/disk/Makefile.am
+++ b/gmond/modules/disk/Makefile.am
+@@ -11,4 +11,4 @@ moddisk_la_LDFLAGS = -module -avoid-version
+ moddisk_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/example/Makefile.am b/gmond/modules/example/Makefile.am
+index e3bff6a..18b4e3b 100644
+--- a/gmond/modules/example/Makefile.am
+++ b/gmond/modules/example/Makefile.am
+@@ -11,7 +11,7 @@ modexample_la_LDFLAGS = -module -avoid-version
+ EXTRA_DIST = ../conf.d/example.conf
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ 
+ install:
+ 	@echo
+diff --git a/gmond/modules/memory/Makefile.am b/gmond/modules/memory/Makefile.am
+index 82336db..06ad430 100644
+--- a/gmond/modules/memory/Makefile.am
+++ b/gmond/modules/memory/Makefile.am
+@@ -12,4 +12,4 @@ modmem_la_LDFLAGS = -module -avoid-version
+ modmem_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/network/Makefile.am b/gmond/modules/network/Makefile.am
+index 72a4faf..c370d88 100644
+--- a/gmond/modules/network/Makefile.am
+++ b/gmond/modules/network/Makefile.am
+@@ -12,4 +12,4 @@ modnet_la_LDFLAGS = -module -avoid-version
+ modnet_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/perl/Makefile.am b/gmond/modules/perl/Makefile.am
+index b7b095c..f1d0fb9 100644
+--- a/gmond/modules/perl/Makefile.am
+++ b/gmond/modules/perl/Makefile.am
+@@ -28,4 +28,4 @@ install-exec-hook:	../conf.d/modperl.conf README
+ 	mkdir -p $(DESTDIR)$(sysconfdir)/conf.d && \
+ 	  $(INSTALL_DATA) ../conf.d/modperl.conf $(DESTDIR)$(sysconfdir)/conf.d/modperl.conf
+ 
+-INCLUDES = @APR_INCLUDES@ @PERL_INCLUDES@
+INCLUDES = @APR_INCLUDES@ @PERL_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/python/Makefile.am b/gmond/modules/python/Makefile.am
+index f535b07..c8fcac0 100644
+--- a/gmond/modules/python/Makefile.am
+++ b/gmond/modules/python/Makefile.am
+@@ -27,4 +27,4 @@ install-exec-hook:	../conf.d/modpython.conf README
+ 	mkdir -p $(DESTDIR)$(sysconfdir)/conf.d && \
+ 	  $(INSTALL_DATA) ../conf.d/modpython.conf $(DESTDIR)$(sysconfdir)/conf.d/modpython.conf
+ 
+-INCLUDES = @APR_INCLUDES@ @PYTHON_INCLUDES@
+INCLUDES = @APR_INCLUDES@ @PYTHON_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/status/Makefile.am b/gmond/modules/status/Makefile.am
+index cd84069..53968fd 100644
+--- a/gmond/modules/status/Makefile.am
+++ b/gmond/modules/status/Makefile.am
+@@ -11,4 +11,4 @@ modgstatus_la_LDFLAGS = -module -avoid-version
+ EXTRA_DIST = ../conf.d/modgstatus.conf
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/gmond/modules/system/Makefile.am b/gmond/modules/system/Makefile.am
+index 5fc7fb3..566469e 100644
+--- a/gmond/modules/system/Makefile.am
+++ b/gmond/modules/system/Makefile.am
+@@ -16,4 +16,4 @@ modsys_la_LDFLAGS = -module -avoid-version
+ modsys_la_LIBADD = $(top_builddir)/libmetrics/libmetrics.la
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 935c514..6e0499f 100644
+--- a/lib/Makefile.am
+++ b/lib/Makefile.am
+@@ -14,7 +14,7 @@ if BUILD_SFLOW
+ GCFLAGS += -DSFLOW
+ endif
+ 
+-INCLUDES = @APR_INCLUDES@
+INCLUDES = @APR_INCLUDES@ @RPC_CFLAGS@
+ AM_CFLAGS = -I.. -I. -I$(top_builddir)/include/ $(GCFLAGS) -DSYSCONFDIR='"$(sysconfdir)"'
+ 
+ include_HEADERS = gm_protocol.h
+diff --git a/scripts/fixconfig b/scripts/fixconfig
+index 5be7982..6e3d710 100755
+--- a/scripts/fixconfig
+++ b/scripts/fixconfig
+@@ -36,7 +36,7 @@ fi
+ # Additional variables set by configure
+ CFLAGS="`echo '-g -O2 -fno-strict-aliasing -Wall -D_REENTRANT' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
+ LDFLAGS="`echo ' -lpthread  -lapr-1  ' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
+-LIBS="-ldl -lnsl -lnsl -lz -lpcre -lexpat -lconfuse -lpthread "
+LIBS="-ldl -lnsl -lnsl -lz -lpcre -lexpat -lconfuse -lpthread -ltirpc "
+ VERSION="3.7.2"
+ host_cpu="x86_64"
+ 
--- a/sys-cluster/ganglia/ganglia-3.7.2.ebuild
+++ b/sys-cluster/ganglia/ganglia-3.7.2.ebuild
@ -6,7 +6,7 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1

-inherit distutils-r1 eutils multilib systemd
+inherit autotools distutils-r1 eutils multilib systemd

 DESCRIPTION="A scalable distributed monitoring system for clusters and grids"
 HOMEPAGE="http://ganglia.sourceforge.net/"
@ -21,6 +21,7 @@ DEPEND="dev-libs/confuse
 	dev-libs/expat
 	>=dev-libs/apr-1.0
 	net-libs/libnsl:0=
+	net-libs/libtirpc
 	!dev-db/firebird
 	pcre? ( dev-libs/libpcre )
 	python? ( ${PYTHON_DEPS} )"
@ -32,11 +33,14 @@ RDEPEND="
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

 src_prepare() {
+	epatch "${FILESDIR}/01-${PV}-use-tirpc-instead-of-sunrpc.patch"
+
 	if use python && ! use minimal; then
 		pushd gmetad-python >/dev/null || die
 		distutils-r1_src_prepare
 		popd >/dev/null || die
 	fi
+	eautoreconf
 }

 src_configure() {