Compile everything with -fPIC

5 files changed, 110 insertions, 6 deletions

diff --git a/sys-libs/libtermcap-compat/ChangeLog b/sys-libs/libtermcap-compat/ChangeLog
index d322070db008..520b8628683e 100644
--- a/sys-libs/libtermcap-compat/ChangeLog
+++ b/sys-libs/libtermcap-compat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libtermcap-compat
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtermcap-compat/ChangeLog,v 1.17 2004/01/11 14:01:56 azarah Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtermcap-compat/ChangeLog,v 1.18 2004/03/17 18:29:46 aliz Exp $
+
+*libtermcap-compat-2.0.8-r1 (17 Mar 2004)
+
+  17 Mar 2004; Daniel Ahlberg <aliz@gentoo.org>
+  libtermcap-compat-2.0.8-r1.ebuild, files/libtermcap-compat-2.0.8-fPIC.patch:
+  Compile both static and shared lib with -fPIC.
 
   11 Jan 2004; Martin Schlemmer <azarah@gentoo.org>
   libtermcap-compat-1.2.3-r1.ebuild, libtermcap-compat-1.2.3.ebuild,
diff --git a/sys-libs/libtermcap-compat/Manifest b/sys-libs/libtermcap-compat/Manifest
index 04f9655e30b7..65ae8c451688 100644
--- a/sys-libs/libtermcap-compat/Manifest
+++ b/sys-libs/libtermcap-compat/Manifest
@@ -1,9 +1,11 @@
-MD5 421dcc00cb151ebed30819968d6f389f ChangeLog 2564
 MD5 cad4b3245083d323789071eec9030cf7 libtermcap-compat-1.2.3-r1.ebuild 1265
+MD5 fe00a9867e65b0398ad9e3bbaaeb5a56 libtermcap-compat-2.0.8-r1.ebuild 1654
 MD5 8d73aac889bdff397c82581ab9ee6b64 libtermcap-compat-1.2.3.ebuild 1221
+MD5 8b57b1e5ab2f7a7a31e9814a2554034c ChangeLog 2784
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 832c69e9839cb78923af5d9219c6d436 libtermcap-compat-2.0.8.ebuild 1617
-MD5 86463dc73dac3761dc5cfa83c3ec83ef files/digest-libtermcap-compat-1.2.3 72
 MD5 86463dc73dac3761dc5cfa83c3ec83ef files/digest-libtermcap-compat-1.2.3-r1 72
-MD5 c5389fda988845f0c56af4ec72c8d524 files/libtermcap-compat_bcopy_fix.patch 314
+MD5 f44d7442f29d0a63d10f7633925ccd6e files/libtermcap-compat-2.0.8-fPIC.patch 740
+MD5 86463dc73dac3761dc5cfa83c3ec83ef files/digest-libtermcap-compat-1.2.3 72
 MD5 88a1c08b3377362fbf228dd424880fe9 files/digest-libtermcap-compat-2.0.8 211
+MD5 88a1c08b3377362fbf228dd424880fe9 files/digest-libtermcap-compat-2.0.8-r1 211
+MD5 c5389fda988845f0c56af4ec72c8d524 files/libtermcap-compat_bcopy_fix.patch 314
diff --git a/sys-libs/libtermcap-compat/files/digest-libtermcap-compat-2.0.8-r1 b/sys-libs/libtermcap-compat/files/digest-libtermcap-compat-2.0.8-r1
new file mode 100644
index 000000000000..320617ace8a6
--- /dev/null
+++ b/sys-libs/libtermcap-compat/files/digest-libtermcap-compat-2.0.8-r1
@@ -0,0 +1,3 @@
+MD5 37318885db65314f1bcc2b22751123d3 termtypes.tc.gz 228329
+MD5 7a557332d50129e9570dc7a655c4e4cd termcap-2.0.8.tar.bz2 211523
+MD5 de0de2ec41441025214d56f7d8eba462 libtermcap-compat-2.0.8-gentoo-0.1.tar.bz2 9960
diff --git a/sys-libs/libtermcap-compat/files/libtermcap-compat-2.0.8-fPIC.patch b/sys-libs/libtermcap-compat/files/libtermcap-compat-2.0.8-fPIC.patch
new file mode 100644
index 000000000000..19929cf72a98
--- /dev/null
+++ b/sys-libs/libtermcap-compat/files/libtermcap-compat-2.0.8-fPIC.patch
@@ -0,0 +1,29 @@
+--- Makefile	2004-03-17 17:24:04.281593999 +0000
++++ Makefile	2004-03-17 17:24:57.764781342 +0000
+@@ -28,23 +28,18 @@
+ prefix=/
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -c $<
+-	$(CC) $(CFLAGS) -fPIC -c $< -o pic/$@
++	$(CC) $(CFLAGS) -fPIC -c $< -o $@
+ 
+ SRCS = termcap.c tparam.c version.c
+ OBJS= $(SRCS:.c=.o)
+ 
+-all lib: pic .depend $(TARGETS) info
++all lib: .depend $(TARGETS) info
+ 
+ $(STATIC_LIB): $(OBJS)
+ 	$(AR) $(ARFLAGS) $@ $(OBJS)
+ 
+ $(SHARED_LIB): $(OBJS)
+-	cd pic; \
+-	$(CC) -shared -o ../$@ -Wl,-soname,$(SONAME_SHARED_LIB) $(OBJS) -lc
+-
+-pic:
+-	-if [ ! -d pic ]; then mkdir pic; fi
++	$(CC) -shared -o $@ -Wl,-soname,$(SONAME_SHARED_LIB) $(OBJS) -lc
+ 
+ install: lib install-dirs install-data
+ 	-if [ -f $(prefix)/lib/$(SHARED_LIB) ]; then \
diff --git a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r1.ebuild b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r1.ebuild
new file mode 100644
index 000000000000..847b5ee00dfc
--- /dev/null
+++ b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r1.ebuild,v 1.1 2004/03/17 18:29:46 aliz Exp $
+
+inherit eutils
+
+PATCHVER=0.1
+
+MY_PN="${PN/lib/}"
+MY_PN="${MY_PN/-compat/}"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+PATCHDIR="${WORKDIR}/patch"
+DESCRIPTION="Compatibility package for old termcap-based programs"
+HOMEPAGE="http://www.catb.org/~esr/terminfo/"
+SRC_URI="http://www.catb.org/~esr/terminfo/termtypes.tc.gz
+	http://dev.gentoo.org/~seemant/extras/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~seemant/extras/${P}-gentoo-${PATCHVER}.tar.bz2
+	mirror://gentoo/${MY_P}.tar.bz2
+	mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2"
+
+SLOT="0"
+LICENSE="freedist"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64 ~ppc64"
+
+DEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${WORKDIR}
+	mv termtypes.tc termcap
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/tc.file
+
+	cd ${S}; epatch ${FILESDIR}/${PN}_bcopy_fix.patch
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
+
+	epatch ${FILESDIR}/${P}-fPIC.patch
+}
+
+src_compile() {
+	emake prefix="/" CFLAGS="${CFLAGS} -I." || die
+}
+
+src_install () {
+	dodir /lib /include /usr/lib
+	make prefix="${D}" OWNER="root:root" install || die
+
+	# Conflicts with ncurses.
+	rm -rf ${D}/include
+
+	cd ${D}/lib; mv libtermcap.a ../usr/lib
+	# Make sure we link to /lib/libtermcap.so, not /usr/lib/libtermcap.a,
+	# bug #4411.
+	gen_usr_ldscript libtermcap.so
+	dosym libtermcap.so.${PV} /lib/libtermcap.so
+
+	insinto /etc
+	doins ${WORKDIR}/termcap
+
+	cd ${S}
+	dodoc ChangeLog README
+}
+