compile lib with -fPIC; bug 131460

(Portage version: 2.1.2-r7)

5 files changed, 68 insertions, 3 deletions

diff --git a/sys-devel/flex/ChangeLog b/sys-devel/flex/ChangeLog
index 6d0d723b79fa..fb3c04940282 100644
--- a/sys-devel/flex/ChangeLog
+++ b/sys-devel/flex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/flex
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.51 2006/10/17 10:38:51 uberlord Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.52 2007/02/06 11:56:41 blubb Exp $
+
+*flex-2.5.33-r2 (06 Feb 2007)
+
+  06 Feb 2007; Simon Stelling <blubb@gentoo.org>
+  +files/flex-2.5.33-pic.patch, +flex-2.5.33-r2.ebuild:
+  compile lib with -fPIC; bug 131460
 
   17 Oct 2006; Roy Marples <uberlord@gentoo.org> flex-2.5.33-r1.ebuild:
   Added ~sparc-fbsd keyword.
diff --git a/sys-devel/flex/files/digest-flex-2.5.33-r2 b/sys-devel/flex/files/digest-flex-2.5.33-r2
new file mode 100644
index 000000000000..7a65ac6d8d99
--- /dev/null
+++ b/sys-devel/flex/files/digest-flex-2.5.33-r2
@@ -0,0 +1,3 @@
+MD5 343374a00b38d9e39d1158b71af37150 flex-2.5.33.tar.bz2 695464
+RMD160 360e08457d324c5b87c02b0ed61983877c173c98 flex-2.5.33.tar.bz2 695464
+SHA256 53b56a62ea9409b99b7a0ac4a5204fac16ca7eaf39b9374164c346d6badc6914 flex-2.5.33.tar.bz2 695464
diff --git a/sys-devel/flex/files/digest-flex-2.5.4a-r6 b/sys-devel/flex/files/digest-flex-2.5.4a-r6
index 679ba09b5190..1b1ca42d4f87 100644
--- a/sys-devel/flex/files/digest-flex-2.5.4a-r6
+++ b/sys-devel/flex/files/digest-flex-2.5.4a-r6
@@ -1,2 +1,6 @@
-MD5 bd8753d0b22e1f4ec87a553a73021adf flex-2.5.4a.tar.gz 380995
 MD5 396f08cba3e1a3425071a7fee397cce4 flex-2.5.4a-autoconf.patch.bz2 13710
+RMD160 e2797f6e1e0f60cb715906eae34415a66b0e3f8b flex-2.5.4a-autoconf.patch.bz2 13710
+SHA256 d2c9367c0995c8cc986c4e991e880bf49ce2766df3e5139b6811a67ee94ce46c flex-2.5.4a-autoconf.patch.bz2 13710
+MD5 bd8753d0b22e1f4ec87a553a73021adf flex-2.5.4a.tar.gz 380995
+RMD160 6b8ff62207fd3961ad2544db083cec1e42b8519b flex-2.5.4a.tar.gz 380995
+SHA256 791e8e26d35faed05654b17fe3a9e64eea0874d623c5aaaaf532e164378e8407 flex-2.5.4a.tar.gz 380995
diff --git a/sys-devel/flex/files/flex-2.5.33-pic.patch b/sys-devel/flex/files/flex-2.5.33-pic.patch
new file mode 100644
index 000000000000..88ac8b3ce98a
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.5.33-pic.patch
@@ -0,0 +1,12 @@
+--- Makefile.in	2007-02-06 12:27:32.000000000 +0100
++++ Makefile.in.new	2007-02-06 12:29:50.000000000 +0100
+@@ -993,7 +993,9 @@
+ ecs.o: ecs.c flexdef.h flexint.h
+ gen.o: gen.c flexdef.h flexint.h tables.h tables_shared.h
+ libmain.o: libmain.c
++	$(COMPILE) -fPIC -DPIC -o libmain.o -c libmain.c
+ libyywrap.o: libyywrap.c
++	$(COMPILE) -fPIC -DPIC -o libyywrap.o -c libyywrap.c
+ main.o: main.c flexdef.h flexint.h version.h options.h scanopt.h \
+  tables.h tables_shared.h
+ misc.o: misc.c flexdef.h flexint.h tables.h tables_shared.h
diff --git a/sys-devel/flex/flex-2.5.33-r2.ebuild b/sys-devel/flex/flex-2.5.33-r2.ebuild
new file mode 100644
index 000000000000..3213c0fe8a29
--- /dev/null
+++ b/sys-devel/flex/flex-2.5.33-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.33-r2.ebuild,v 1.1 2007/02/06 11:56:41 blubb Exp $
+
+inherit eutils flag-o-matic
+
+#DEB_VER=36
+DESCRIPTION="GNU lexical analyser generator"
+HOMEPAGE="http://flex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/flex/${P}.tar.bz2"
+#	mirror://debian/pool/main/f/flex/${PN}_${PV}-${DEB_VER}.diff.gz"
+
+LICENSE="FLEX"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="nls static"
+
+DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	[[ -n ${DEB_VER} ]] && epatch "${WORKDIR}"/${PN}_${PV}-${DEB_VER}.diff
+	epatch "${FILESDIR}"/${PN}-2.5.31-include.patch
+	epatch "${FILESDIR}"/${P}-isatty.patch #119598
+	epatch "${FILESDIR}"/${P}-pic.patch
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	econf $(use_enable nls) || die
+	emake || die
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS ONEWS README* RoadMap THANKS TODO
+	dosym flex /usr/bin/lex
+}