Version bump to match gcc-3.4.3; hopefully this will be the last libffi of this type/in this series that I make - >=gcc-3.4.3-r1 should support libffi with gcj and objc now

4 files changed, 230 insertions, 9 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index 000129e1e6b8..31d998c05320 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.22 2004/11/23 22:20:04 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.23 2004/12/03 22:31:43 fafhrd Exp $
+
+*libffi-3.4.3 (03 Dec 2004)
+
+  03 Dec 2004; Armando Di Cianno <fafhrd@gentoo.org> +libffi-3.4.3.ebuild:
+  Version bump to match gcc-3.4.3; hopefully this will be the last libffi of
+  this type/in this series that I make - >=gcc-3.4.3-r1 should support libffi
+  with gcj and objc now
 
   23 Nov 2004; Tom Gall <tgall@gentoo.org>
   libffi-3.4.1-r1.ebuild:
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 849838b40fec..42105014175b 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -1,16 +1,18 @@
-MD5 140555977f2b56f296cfbd81b65b41cd ChangeLog 3324
+MD5 d8407b59a6bee3e78653ce47be09b84a libffi-3.4.1-r1.ebuild 5749
+MD5 24abb999f43a9b5d6afced36b822f6e9 libffi-3.3.4.ebuild 6674
 MD5 3113b98f43bda47db0f39bd6f6e3aad1 libffi-1.20.ebuild 605
+MD5 a52e3123e1f1577437888aeb9ed57f89 libffi-3.3.3-r1.ebuild 6678
 MD5 e21dd80ca7b21c735c8e7808a6c3c82e libffi-3.3.3.ebuild 6895
 MD5 8b4c997d2e8a94224253596a6068763e libffi-3.4.1.ebuild 7097
+MD5 c032c848904cefff52eb246a4eab62a0 libffi-3.4.3.ebuild 5683
+MD5 56f67ec5e3386b501e9f2545e227ca70 ChangeLog 3609
 MD5 ef1d6e99f954cc3412a9e513a2d80c64 metadata.xml 1836
-MD5 a52e3123e1f1577437888aeb9ed57f89 libffi-3.3.3-r1.ebuild 6678
-MD5 d8407b59a6bee3e78653ce47be09b84a libffi-3.4.1-r1.ebuild 5749
-MD5 24abb999f43a9b5d6afced36b822f6e9 libffi-3.3.4.ebuild 6674
 MD5 ed8f1e978198c34ad3dc3b81c4804199 files/digest-libffi-1.20 63
-MD5 14f4d6619c938dbb907e2420c0eeefd9 files/digest-libffi-3.3.3 64
-MD5 03a0e46a8ce1aff598b68a731112c13a files/digest-libffi-3.4.1 64
+MD5 1ca677e646f4d209e68601c9ba83c629 files/libffi-without-libgcj.dpatch 2255
+MD5 78c9b1a1b40fcc12f8cf34d57a970f00 files/libffi-soversion.dpatch 1943
 MD5 14f4d6619c938dbb907e2420c0eeefd9 files/digest-libffi-3.3.3-r1 64
 MD5 03a0e46a8ce1aff598b68a731112c13a files/digest-libffi-3.4.1-r1 64
-MD5 78c9b1a1b40fcc12f8cf34d57a970f00 files/libffi-soversion.dpatch 1943
-MD5 1ca677e646f4d209e68601c9ba83c629 files/libffi-without-libgcj.dpatch 2255
+MD5 14f4d6619c938dbb907e2420c0eeefd9 files/digest-libffi-3.3.3 64
 MD5 4068b84d9ce9d440b063718549cfc354 files/digest-libffi-3.3.4 64
+MD5 03a0e46a8ce1aff598b68a731112c13a files/digest-libffi-3.4.1 64
+MD5 2ca380cbcf0547fb5d2a671c1c0296de files/digest-libffi-3.4.3 64
diff --git a/dev-libs/libffi/files/digest-libffi-3.4.3 b/dev-libs/libffi/files/digest-libffi-3.4.3
new file mode 100644
index 000000000000..a7535796098b
--- /dev/null
+++ b/dev-libs/libffi/files/digest-libffi-3.4.3
@@ -0,0 +1 @@
+MD5 e744b30c834360fccac41eb7269a3011 gcc-3.4.3.tar.bz2 27425338
diff --git a/dev-libs/libffi/libffi-3.4.3.ebuild b/dev-libs/libffi/libffi-3.4.3.ebuild
new file mode 100644
index 000000000000..39a6f8c789df
--- /dev/null
+++ b/dev-libs/libffi/libffi-3.4.3.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.4.3.ebuild,v 1.1 2004/12/03 22:31:43 fafhrd Exp $
+
+inherit eutils flag-o-matic libtool gnuconfig
+
+# This ebuild mod'd from libstdc++ compatbility package ebuild to create
+#   a similar structure for libffi, which is also included in gcc sources.
+#   __Armando Di Cianno <fafhrd@gentoo.org>
+
+do_filter_flags() {
+	declare setting
+
+	strip-flags
+
+	# In general gcc does not like optimization, and add -O2 where
+	# it is safe.  This is especially true for gcc 3.3 + 3.4
+	replace-flags -O? -O2
+
+	# xgcc isnt patched with propolice
+	filter-flags -fstack-protector-all
+	filter-flags -fno-stack-protector-all
+	filter-flags -fstack-protector
+	filter-flags -fno-stack-protector
+
+	# xgcc isnt patched with the gcc symbol visibility patch
+	filter-flags -fvisibility-inlines-hidden
+	filter-flags -fvisibility=hidden
+
+	# ...sure, why not?
+	strip-unsupported-flags
+}
+
+S=${WORKDIR}/gcc-${PV}
+
+# Theoretical cross compiler support
+[ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}"
+
+LOC="/usr"
+MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`"
+MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`"
+
+LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}"
+BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}"
+DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}"
+# Dont install in /usr/include/g++-v3/, but in gcc internal directory.
+# We will handle /usr/include/g++-v3/ with gcc-config ...
+STDCXX_INCDIR="${LIBPATH}/include/g++-v${MY_PV/\.*/}"
+
+SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2"
+
+DESCRIPTION="libffi (from gcc) does not commonly build unless gcj is compiled, but is used by other projects, like GNUstep."
+HOMEPAGE="http://gcc.gnu.org/"
+
+LICENSE="libffi"
+
+KEYWORDS="-* ~ppc"
+IUSE="nls"
+
+SLOT="0"
+## 3.2.3 -> 3.3.x install .so.5, so lets slot to 5
+#if [ "${CHOST}" == "${CCHOST}" ]
+#then
+#	SLOT="5"
+#else
+#	SLOT="${CCHOST}-5"
+#fi
+
+DEPEND="virtual/libc
+	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
+	>=sys-devel/binutils-2.14.90.0.6-r1
+	>=sys-devel/bison-1.875
+	>=sys-devel/gcc-config-1.3.1
+	>=sys-devel/gcc-3.4.3*
+	!build? ( >=sys-libs/ncurses-5.2-r2
+	          nls? ( sys-devel/gettext ) )"
+
+RDEPEND="virtual/libc
+	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
+	>=sys-devel/gcc-config-1.3.1
+	>=sys-libs/zlib-1.1.4
+	>=sys-apps/texinfo-4.2-r4
+	!build? ( >=sys-libs/ncurses-5.2-r2 )"
+
+PDEPEND="sys-devel/gcc-config"
+
+src_unpack() {
+	unpack ${A}
+
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/libffi-without-libgcj.dpatch
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/libffi-soversion.dpatch
+
+	# mainly for AMD64, but can't hurt to run it
+	sed -i -e 's/MULTILIB_OSDIRNAMES\ =.*/MULTILIB_OSDIRNAMES\ =\ ..\/lib64\ ..\/lib32/' ${S}/gcc/config/i386/t-linux64
+
+	cd ${S}
+	# Fixup libtool to correctly generate .la files with portage
+	elibtoolize --portage --shallow
+
+	cd ${S}; ./contrib/gcc_update --touch &> /dev/null
+	gnuconfig_update
+}
+
+src_compile() {
+
+	local myconf=
+
+	if ! use nls || use build
+	then
+		myconf="${myconf} --disable-nls"
+	else
+		myconf="${myconf} --enable-nls --without-included-gettext"
+	fi
+
+	use amd64 && myconf="${myconf} --disable-multilib"
+
+	do_filter_flags
+	einfo "CFLAGS=\"${CFLAGS}\""
+	einfo "CXXFLAGS=\"${CXXFLAGS}\""
+
+	# Build in a separate build tree
+	mkdir -p ${WORKDIR}/build
+	cd ${WORKDIR}/build
+
+	einfo "Configuring libffi..."
+	addwrite "/dev/zero"
+	${S}/configure --prefix=${LOC} \
+		--bindir=${BINPATH} \
+		--includedir=${LIBPATH}/include \
+		--datadir=${DATAPATH} \
+		--mandir=${DATAPATH}/man \
+		--infodir=${DATAPATH}/info \
+		--enable-shared \
+		--host=${CHOST} \
+		--target=${CCHOST} \
+		--with-system-zlib \
+		--enable-languages=c++,objc \
+		--enable-threads=posix \
+		--enable-long-long \
+		--disable-checking \
+		--enable-cstdio=stdio \
+		--enable-__cxa_atexit \
+		--enable-version-specific-runtime-libs \
+		--with-gxx-include-dir=${STDCXX_INCDIR} \
+		--with-local-prefix=${LOC}/local \
+		${myconf} || die
+
+	touch ${S}/gcc/c-gperf.h
+
+	# Setup -j in MAKEOPTS
+	get_number_of_jobs
+
+	einfo "Compiling libffi..."
+	S="${WORKDIR}/build" \
+	emake all-target-libffi \
+		LIBPATH="${LIBPATH}" \
+		BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || die
+}
+
+src_install() {
+	local x=
+
+	# Do allow symlinks in ${LOC}/lib/gcc-lib/${CHOST}/${PV}/include as
+	# this can break the build.
+	for x in ${WORKDIR}/build/gcc/include/*
+	do
+		if [ -L ${x} ]
+		then
+			rm -f ${x}
+			continue
+		fi
+	done
+	# Remove generated headers, as they can cause things to break
+	# (ncurses, openssl, etc).
+	for x in `find ${WORKDIR}/build/gcc/include/ -name '*.h'`
+	do
+		if grep -q 'It has been auto-edited by fixincludes from' ${x}
+		then
+			rm -f ${x}
+		fi
+	done
+
+	einfo "Installing libffi..."
+	# Do the 'make install' from the build directory
+	cd ${WORKDIR}/build
+	S="${WORKDIR}/build" \
+	make prefix=${LOC} \
+		bindir=${BINPATH} \
+		includedir=${LIBPATH}/include \
+		datadir=${DATAPATH} \
+		mandir=${DATAPATH}/man \
+		infodir=${DATAPATH}/info \
+		DESTDIR="${D}" \
+		LIBPATH="${LIBPATH}" \
+		install-target-libffi || die
+
+	mkdir -p ${D}/${LOC}/include/${PN}
+	mv ${D}/${LOC}/lib/gcc-lib/${CCHOST}/${PV}/include/* ${D}/${LOC}/include/${PN}
+	mv ${D}/${LOC}/lib/gcc/${CCHOST}/${PV}/include/libffi/* ${D}/${LOC}/include/${PN}
+	# remove now useless directory...
+	rm -Rf ${D}/${LOC}/lib/gcc-lib/
+	rm -Rf ${D}/${LOC}/lib/gcc
+
+	mkdir -p ${D}/${LOC}/lib/${PN}/
+	mv ${D}/${LOC}/{lib,lib64}/* ${D}/${LOC}/lib/${PN}/
+
+	mkdir -p ${D}/etc/env.d/
+	echo "LDPATH=\"${LOC}/lib/${PN}\"" >> ${D}/etc/env.d/99libffi
+	echo "CPATH=\"${LOC}/include/${PN}\"" >> ${D}/etc/env.d/99libffi
+}
+