Merge bk://openembedded@openembedded.bkbits.net/packages

into sugarcube.dyndns.org:/home/oe/oe/packages

2004/08/09 20:53:34+02:00 dyndns.org!reenoo
follow debian (ffitarget.h, soname); add do_stage

BKrev: 4117c893u3s9wX5o2CHQMXmMbkPNDA

2 files changed, 97 insertions, 0 deletions

diff --git a/libffi/libffi-2.0+gcc3.4.1/soname.patch b/libffi/libffi-2.0+gcc3.4.1/soname.patch
index e69de29bb2..bccf75d183 100644
--- a/libffi/libffi-2.0+gcc3.4.1/soname.patch
+++ b/libffi/libffi-2.0+gcc3.4.1/soname.patch
@@ -0,0 +1,32 @@
+--- libffi.orig/Makefile.am	2003-10-21 21:01:53.000000000 +0200
++++ libffi/Makefile.am	2004-08-09 13:26:13.000000000 +0200
+@@ -175,7 +175,7 @@
+ 
+ AM_CFLAGS = -Wall -g -fexceptions
+ 
+-libffi_la_LDFLAGS = -release $(VERSION) 
++libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
+ 
+ INCLUDES = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
+ 
+--- libffi.orig/libtool-version	1970-01-01 01:00:00.000000000 +0100
++++ libffi/libtool-version	2004-08-09 13:24:18.000000000 +0200
+@@ -0,0 +1,6 @@
++# This file is used to maintain libtool version info for libffi.  See
++# the libtool manual to understand the meaning of the fields.  This is
++# a separate file so that version updates don't involve re-running
++# automake.
++# CURRENT:REVISION:AGE
++3:0:0
+
+--- libtool.orig/Makefile.in	2004-08-09 14:29:09.000000000 +0200
++++ libtool/Makefile.in	2004-08-09 14:29:53.000000000 +0200
+@@ -226,7 +226,7 @@
+ 
+ AM_CFLAGS = -Wall -g -fexceptions
+ 
+-libffi_la_LDFLAGS = -release $(VERSION) 
++libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
+ 
+ INCLUDES = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/libffi/libffi_2.0+gcc3.4.1.oe b/libffi/libffi_2.0+gcc3.4.1.oe
index e69de29bb2..bd8fd88412 100644
--- a/libffi/libffi_2.0+gcc3.4.1.oe
+++ b/libffi/libffi_2.0+gcc3.4.1.oe
@@ -0,0 +1,65 @@
+DESCRIPTION = "Foreign Function Interface library"
+LICENSE = "libffi"
+PRIORITY = "optional"
+MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+
+inherit autotools
+
+PACKAGES = "${PN} ${PN}-dev"
+
+FILES_${PN} = "${libdir}/libffi.so.*"
+
+FILES_${PN}-dev = "${includedir}/ffi* \
+		   ${libdir}/libffi.a \
+		   ${libdir}/libffi.la \
+		   ${libdir}/libffi.so"
+
+GCC_VER = "${@oe.data.getVar('PV',d,1).split('gcc')[1]}"
+
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${GCC_VER}/gcc-${GCC_VER}.tar.bz2 \
+	   file://soname.patch;patch=1"
+
+MIRRORS_prepend () {
+${GNU_MIRROR}/gcc/	http://gcc.get-software.com/releases/
+${GNU_MIRROR}/gcc/	http://mirrors.rcn.net/pub/sourceware/gcc/releases/
+}
+
+S = "${WORKDIR}/gcc-${GCC_VER}/libffi"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+EXTRA_OECONF = "--disable-nls \
+                --with-gnu-ld \
+                --enable-shared \
+                --enable-target-optspace \
+                --enable-languages=c,c++,f77 \
+                --enable-threads=posix \
+                --enable-multilib \
+                --enable-c99 \
+                --enable-long-long \
+                --enable-symvers=gnu \
+                --program-prefix=${TARGET_PREFIX} \
+                ${EXTRA_OECONF_PATHS}"
+
+EXTRA_OECONF_PATHS = "--with-local-prefix=${prefix}/local \
+                      --with-gxx-include-dir=${includedir}/c++/${PV}"
+
+do_configure () {
+	(cd ${S}/.. && gnu-configize) || die "failure running gnu-configize"
+	oe_runconf
+}
+
+do_install_append() {
+	# follow debian and move this to $includedir
+	mv ${D}/${libdir}/gcc/arm-linux/3.4.1/include/libffi/ffitarget.h ${D}/${includedir}/
+}
+
+ffi_include = "ffi.h ffitarget.h"
+
+do_stage () {
+	oe_libinstall -so -C .libs libffi ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/
+	for i in ${ffi_include}; do
+		install -m 0644 include/$i ${STAGING_INCDIR}/
+	done
+}