diff options
author | Jeroen Roovers <jer@gentoo.org> | 2011-11-18 04:34:54 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2011-11-18 04:34:54 +0000 |
commit | 0512082b81de8ee1ae9922bc9bcf06c1395e6d69 (patch) | |
tree | db5326bf2c313cfbf1a506334bc0d4450e57afa8 /net-analyzer/nb | |
parent | Fix the fcaps() error message to take the running kernel version into account. (diff) | |
download | historical-0512082b81de8ee1ae9922bc9bcf06c1395e6d69.tar.gz historical-0512082b81de8ee1ae9922bc9bcf06c1395e6d69.tar.bz2 historical-0512082b81de8ee1ae9922bc9bcf06c1395e6d69.zip |
Respect CFLAGS/LDFLAGS. Fix underlinking issue by using pkg-config to obtain a list of libraries (bug #371893). Build nbTutorial.info without including fdl.texi.
Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64
Diffstat (limited to 'net-analyzer/nb')
-rw-r--r-- | net-analyzer/nb/ChangeLog | 8 | ||||
-rw-r--r-- | net-analyzer/nb/Manifest | 11 | ||||
-rw-r--r-- | net-analyzer/nb/files/nb-0.8.3-configure.patch | 49 | ||||
-rw-r--r-- | net-analyzer/nb/nb-0.8.3.ebuild | 21 |
4 files changed, 75 insertions, 14 deletions
diff --git a/net-analyzer/nb/ChangeLog b/net-analyzer/nb/ChangeLog index f25ec7e98b26..77661df27f19 100644 --- a/net-analyzer/nb/ChangeLog +++ b/net-analyzer/nb/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/nb # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/ChangeLog,v 1.10 2011/10/27 18:42:06 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/ChangeLog,v 1.11 2011/11/18 04:34:54 jer Exp $ + + 18 Nov 2011; Jeroen Roovers <jer@gentoo.org> nb-0.8.3.ebuild, + +files/nb-0.8.3-configure.patch: + Respect CFLAGS/LDFLAGS. Fix underlinking issue by using pkg-config to obtain + a list of libraries (bug #371893). Build nbTutorial.info without including + fdl.texi. 27 Oct 2011; Jeroen Roovers <jer@gentoo.org> nb-0.6.5-r1.ebuild, nb-0.8.3.ebuild: diff --git a/net-analyzer/nb/Manifest b/net-analyzer/nb/Manifest index 4a86e824a96f..d1820391ed0d 100644 --- a/net-analyzer/nb/Manifest +++ b/net-analyzer/nb/Manifest @@ -2,16 +2,17 @@ Hash: SHA1 AUX nb-0.6.5-CFLAGS-as-needed.patch 2926 RMD160 8d3cf6d2e4f459c4a618fab93579605593b424d0 SHA1 392a99fb979d4352ea18e7e664e6c48e59f3898e SHA256 f87bfd6777ebb15c77b375c106659841d7343279b4caeab6ba0ab5c4850f5f26 +AUX nb-0.8.3-configure.patch 2425 RMD160 d05ca773f78dcdd3dc2aee55aed9ccc60dba51cc SHA1 2f791e7e53782dadeeeba29b721be144bdf3d5a7 SHA256 08893539eff48a21f1190a298e7d2755fcf8f4e7d8abb35f87c764211e4de149 DIST nb-0.6.5-source.tar.gz 558732 RMD160 8bb21a2e4e253af75bd206108e4cbf662343350c SHA1 c957662c08f1da90b101c7b217f5b37ccf4925c6 SHA256 fb8e0de88cd87dee81b6952d613b7010acecae35fc94a353198efc9cd5da9048 DIST nodebrain-0.8.3.tar.gz 2014100 RMD160 23755471c0b4030eb29ff4955fb5dd2dace06f05 SHA1 1de8c67cafad0d5fb06b2b49e1b33c2ac0093a9a SHA256 2bef6bef34ad458373cfc63ec95fc351682ad1b14e4d93e918f506d6f4a94586 EBUILD nb-0.6.5-r1.ebuild 829 RMD160 75252c74db479159558a753ca75bf039fd88e235 SHA1 0dae0eb90cafeaf25abb2de5366ea158f267fdef SHA256 55c7ef16f1e92f1240cc12903767098b3ed50a4feffdb4ca7d6c3018f4549192 -EBUILD nb-0.8.3.ebuild 1105 RMD160 ceb100324645995c94c7ddf5074399e603717b8f SHA1 f392504257bacac046213dd6f20629218cb6b991 SHA256 d116dd945348245ff135f97d97feb382901d097b8db67dd6b7304e788fc48474 -MISC ChangeLog 1774 RMD160 faf3576c73c41f3569bd4a5d198c4f0b3167435a SHA1 e2a9c8a0888132b617243c2490016b79abf90cb9 SHA256 444ebccdde0650a2a14294e6869075c2d2a2b89bf0939f9d5176c4062fe62e45 +EBUILD nb-0.8.3.ebuild 1141 RMD160 e38ec4f447e269d45049de173e57171e3ef30722 SHA1 03baa2286e6e1a8a3347ca79703141ec1cbc0a2f SHA256 257f8cd7ba161b7ea9a48ab3499a643325e8413f4aa242872e80f530986ea435 +MISC ChangeLog 2042 RMD160 01ea759e93ba5b07390e28f96c2def92c5b20d91 SHA1 763cf5ca08bcc6f99e8c460c220317c57d5e09ca SHA256 83316d1f6a1533de7640aca7c0bd02ba5af5ddd0e2c71e7b87a90886101863b2 MISC metadata.xml 251 RMD160 834ecc65719f8431c7d1a570699eff6f34012338 SHA1 27f0a6af77da289e4476a513aa45930eae0fe304 SHA256 0d8b4ea8ec9e2906498a9f4b20f1403c0c8435082d3b357d42040eddeaf1ed29 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk6ppggACgkQVWmRsqeSphPsNACfVKfrEIHSP70DsC8YYwyDuQPA -ge0AniT4Z70PnK5CRCmPdcrqzgC6fMoR -=8st8 +iEYEARECAAYFAk7F4HQACgkQVWmRsqeSphN0KACfXhYPqU718ZKHcjdE3B7OcmBv +zboAnjm47rs0LQhvU8sf/rm0PUU4SMac +=Ks3J -----END PGP SIGNATURE----- diff --git a/net-analyzer/nb/files/nb-0.8.3-configure.patch b/net-analyzer/nb/files/nb-0.8.3-configure.patch new file mode 100644 index 000000000000..645c80d0279b --- /dev/null +++ b/net-analyzer/nb/files/nb-0.8.3-configure.patch @@ -0,0 +1,49 @@ +1) Use pkg-config to figure out openssl libraries (also fixes underlinking with + ld.gold, bug #371893). +2) Respect CFLAGS/LDFLAGS. + +-jer + + +--- a/lib/configure.ac ++++ b/lib/configure.ac +@@ -113,7 +113,7 @@ + AC_CHECK_LIB([pcre],[pcre_compile],,[AC_MSG_ERROR(Required library -lpcre not found. You may want to download it from http://www.pcre.org or locate it and include directory in LD_LIBRARY_PATH to support this build.)]) + AC_CHECK_LIB([readline],[readline],,[AC_MSG_ERROR(Required library -lreadline not found. You may want to download it from http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html or locate it and include directory in LD_LIBRARY_PATH to support this build.)]) + AC_CHECK_LIB(history,add_history,,[AC_MSG_ERROR(Required library -lhistory not found. You may want to download it from http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html or locate it and include directory in LD_LIBRARY_PATH to support this build.)]) +-AC_CHECK_LIB(ssl,SSL_library_init,,[AC_MSG_ERROR(Required library -lssl not found. You may want to download it from http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html or locate it and include directory in LD_LIBRARY_PATH to support this build.)]) ++PKG_CHECK_MODULES(libssl,openssl,LIBS="$LIBS `$PKG_CONFIG --cflags --libs openssl`",[AC_MSG_ERROR(Required library -lssl not found. You may want to download it from http://www.openssl.org/ or locate it and include directory in LD_LIBRARY_PATH to support this build.)]) + + AC_SEARCH_LIBS(socket,socket) + AC_SEARCH_LIBS(inet_ntoa,nsl) +@@ -152,8 +152,6 @@ + # define a release date variable + AC_DEFINE_UNQUOTED(NB_COMPILE_PLATFORM,"$host",[Define compile platform]) + +-CFLAGS="-Wall -I/usr/local/include -I/usr/local/ssl/include" +-LDFLAGS="-L/usr/local/ssl/lib" + case "$host" in + *-netbsd*) + AC_DEFINE(NETBSD,,[Define if NetBSD]) +--- a/module/configure.ac ++++ b/module/configure.ac +@@ -100,8 +100,6 @@ + + AC_SUBST([NB_MOD_PATH],[../.libs]) + +-CFLAGS="-Wall -I/usr/local/include -I/usr/local/ssl/include" +-LDFLAGS="-L/usr/local/ssl/lib" + + #===================================== + # Checks for header files. +--- a/module/webster/configure.ac ++++ b/module/webster/configure.ac +@@ -87,8 +87,6 @@ + # AC_PATH_PROGS([NB],[nb-0.7.5 nb-0.7.4 nb-0.7.3 nb-0.7.2 nb-0.7.1 nb]) + #fi + +-CFLAGS="-I/usr/local/include -I/usr/local/ssl/include" +-LDFLAGS="-L/usr/local/ssl/lib" + + #===================================== + # Checks for libraries. diff --git a/net-analyzer/nb/nb-0.8.3.ebuild b/net-analyzer/nb/nb-0.8.3.ebuild index 68c1b729be61..7047d33016c5 100644 --- a/net-analyzer/nb/nb-0.8.3.ebuild +++ b/net-analyzer/nb/nb-0.8.3.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/nb-0.8.3.ebuild,v 1.2 2011/10/27 18:42:06 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/nb-0.8.3.ebuild,v 1.3 2011/11/18 04:34:54 jer Exp $ EAPI="3" -inherit autotools-utils +inherit autotools autotools-utils eutils DESCRIPTION="Nodebrain is a tool to monitor and do event correlation." HOMEPAGE="http://nodebrain.sourceforge.net/" @@ -15,7 +15,10 @@ SLOT="0" KEYWORDS="~ppc ~x86" IUSE="static-libs" -DEPEND="dev-lang/perl" +DEPEND=" + dev-lang/perl + sys-apps/texinfo +" RDEPEND=" !sys-boot/netboot !www-apps/nanoblogger @@ -24,13 +27,16 @@ RDEPEND=" S="${WORKDIR}/nodebrain-${PV}" src_prepare() { - # Prevent make from rebuilding this target, since - # fdl.texi is not included in the distribution - touch doc/nbTutorial/nbTutorial.info || die + epatch "${FILESDIR}"/${P}-configure.patch + + # fdl.texi is not included in the sources + sed -i doc/nbTutorial/nbTutorial.texi -e '/@include fdl.texi/d' || die + + eautoreconf } src_configure() { - econf $(use_enable static-libs static) + econf $(use_enable static-libs static) --include=/usr/include } src_compile() { @@ -39,7 +45,6 @@ src_compile() { } src_install() { - #DIR="${D}/usr" ./install-nb || die "install failed" emake DESTDIR="${D}" install || die use static-libs || remove_libtool_files dodoc AUTHORS NEWS README THANKS sample/* |