Fix cross-compiling and remove USE=static ... always build shared libraries.

diff --git a/sys-apps/tcp-wrappers/ChangeLog b/sys-apps/tcp-wrappers/ChangeLog
index b1598938ea75fd6ed464c43bd4b0f6a487fb804a..66ea4c7cf7a8328cf0101bf883961570da487442 100644 (file)
--- a/sys-apps/tcp-wrappers/ChangeLog
+++ b/sys-apps/tcp-wrappers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/tcp-wrappers
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/ChangeLog,v 1.33 2004/07/17 01:28:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/ChangeLog,v 1.34 2004/12/13 16:05:03 vapier Exp $
+
+  13 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  tcp-wrappers-7.6-r8.ebuild:
+  Fix cross-compiling and remove USE=static ... always build shared libraries.
 
   16 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
   tcp-wrappers-7.6-r8.ebuild:

diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index dd188d7e3d9bbdf1c0962b5eb24660cf16aa9ebe..0caec8069bb9973b57a7c4771f924cabb94225a6 100644 (file)
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ff0780e39a0eca8e49bd6e1fc0f660d3 ChangeLog 5015
+MD5 eded6e6c261fe2e32ffe174661f4ea16 ChangeLog 5172
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 2d7830db011bc50602d527bb0577903b tcp-wrappers-7.6-r8.ebuild 2287
+MD5 b1ab4eaf71a1a2b8f2a9881380009b21 tcp-wrappers-7.6-r8.ebuild 2255
 MD5 b4d27b4d9d3d841a7199217735e52049 files/digest-tcp-wrappers-7.6-r8 146
 MD5 da6fe337f8e6ddda00b5d52c588ca70a files/hosts.allow.example 585
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
+Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFA+1whHTu7gpaalycRAqGkAKCEetPrWYl5Okr4b9BboZTXyuTTrACffRmG
-GmKlEv+jOEBXHvwoEQ6p6sk=
-=OX1m
+iD8DBQFBvb3IroRuSHgZdywRAqARAJ4jSbYwXd7iweEgdvNGj7kYWL870gCff9C+
+cpuPxNA7Yo7LdJ/eqLA1qV0=
+=HO3e
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild
index 4a1c073c5a78957f441b59d8dee214e4bbdd71d8..60520b4cb8693da1c63dd13ed7c3e403665eea2f 100644 (file)
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild,v 1.16 2004/07/19 05:28:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild,v 1.17 2004/12/13 16:05:03 vapier Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 MY_P="${P//-/_}"
 S="${WORKDIR}/${MY_P}"
@@ -13,12 +13,12 @@ SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
 
 LICENSE="tcp_wrappers_license"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
-IUSE="ipv6 static"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+IUSE="ipv6"
 
-DEPEND="virtual/libc
-       >=sys-apps/sed-4"
 RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+       >=sys-apps/sed-4"
 
 src_unpack() {
        unpack ${A}
@@ -28,30 +28,26 @@ src_unpack() {
        sed -i \
                -e "s:-O:${CFLAGS}:" \
                -e "s:AUX_OBJ=.*:AUX_OBJ= \\\:" \
-               Makefile \
-               || die "sed Makefile failed"
+               Makefile || die "makefile patch prep"
 
        PATCHDIR=${WORKDIR}/${PV}-patches
-
        epatch ${PATCHDIR}/${P}-makefile.patch.bz2
-
        epatch ${PATCHDIR}/generic
-
-       use static || epatch ${PATCHDIR}/${P}-shared.patch.bz2
+       epatch ${PATCHDIR}/${P}-shared.patch.bz2
        use ipv6 && epatch ${PATCHDIR}/${P}-ipv6-1.14.diff.bz2
 
-       # make it parallel-friendly.
+       # make it parallel/cross-compile friendly.
        sed -i \
+               -e 's:gcc:$(CC):' \
                -e 's:@make :@$(MAKE) :' \
                -e 's:make;:$(MAKE);:' \
-               Makefile \
-               || die "sed Makefile failed"
+               Makefile || die "sed Makefile failed"
 }
 
 src_compile() {
-       local myconf=
+       tc-export CC
 
-       use static || myconf="${myconf} -DHAVE_WEAKSYMS"
+       local myconf="-DHAVE_WEAKSYMS"
        use ipv6 && myconf="${myconf} -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len"
 
        emake \
@@ -80,14 +76,12 @@ src_install() {
        into /usr
        dolib.a libwrap.a
 
-       if ! use static ; then
-               into /
-               newlib.so libwrap.so libwrap.so.0.${PV}
-               dosym /lib/libwrap.so.0.${PV} /lib/libwrap.so.0
-               dosym /lib/libwrap.so.0 /lib/libwrap.so
-               # bug #4411
-               gen_usr_ldscript libwrap.so || die "gen_usr_ldscript failed"
-       fi
+       into /
+       newlib.so libwrap.so libwrap.so.0.${PV}
+       dosym /lib/libwrap.so.0.${PV} /lib/libwrap.so.0
+       dosym /lib/libwrap.so.0 /lib/libwrap.so
+       # bug #4411
+       gen_usr_ldscript libwrap.so || die "gen_usr_ldscript failed"
 
        dodoc BLURB CHANGES DISCLAIMER README* ${FILESDIR}/hosts.allow.example
 }