libffi-native 2.0+gcc4.3.2 : New recipe.

libffi 2.0+gcc4.3.2: Adjusted to not interfere with the -native recipe.

2 files changed, 42 insertions, 3 deletions

diff --git a/packages/libffi/libffi-native_2.0+gcc4.3.2.bb b/packages/libffi/libffi-native_2.0+gcc4.3.2.bb
new file mode 100644
index 0000000000..f0859e963f
--- /dev/null
+++ b/packages/libffi/libffi-native_2.0+gcc4.3.2.bb
@@ -0,0 +1,30 @@
+require libffi_${PV}.bb
+
+inherit native
+
+EXTRA_OECONF = "--with-gnu-ld \
+                --enable-shared \
+                --enable-target-optspace \
+                --enable-languages=c,c++,f77 \
+                --enable-threads=posix \
+                --disable-multilib \
+                --enable-c99 \
+                --enable-long-long \
+                --enable-symvers=gnu \
+                --program-prefix=${TARGET_PREFIX} \
+                ${EXTRA_OECONF_PATHS}"
+
+ffi_include = "ffi.h ffitarget.h"
+
+install_libffi_headers() {
+	:
+}
+
+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
+}
diff --git a/packages/libffi/libffi_2.0+gcc4.3.2.bb b/packages/libffi/libffi_2.0+gcc4.3.2.bb
index 300df81564..50b1e5fa06 100644
--- a/packages/libffi/libffi_2.0+gcc4.3.2.bb
+++ b/packages/libffi/libffi_2.0+gcc4.3.2.bb
@@ -5,11 +5,13 @@ PRIORITY = "optional"
 
 inherit autotools gettext
 
+PR = "r1"
+
 PACKAGES = "${PN}-dbg ${PN} ${PN}-dev"
 
 FILES_${PN} = "${libdir}/libffi.so.*"
 
-FILES_${PN}-dev = "${includedir}/ffi* \
+FILES_${PN}-dev = "${includedir}/${TARGET_SYS}/ffi* \
 		   ${libdir}/libffi.a \
 		   ${libdir}/libffi.la \
 		   ${libdir}/libffi.so"
@@ -48,8 +50,15 @@ do_configure () {
 }
 
 do_install_append() {
-	# follow debian and move this to $includedir
-	mv ${D}${libdir}/gcc/${TARGET_SYS}/${GCC_VER}/include/libffi/ffitarget.h ${D}${includedir}/
+	install_libffi_headers
+}
+
+# Separate function which can be disabled in the -native recipe.
+install_libffi_headers() {
+	# follow Debian and move this to $includedir/${TARGET_SYS}
+	install -d ${D}${includedir}/${TARGET_SYS}
+	mv ${D}${libdir}/gcc/${TARGET_SYS}/${GCC_VER}/include/ffitarget.h ${D}${includedir}/${TARGET_SYS}
+	mv ${D}${libdir}/gcc/${TARGET_SYS}/${GCC_VER}/include/ffi.h ${D}${includedir}/${TARGET_SYS}
 }
 
 ffi_include = "ffi.h ffitarget.h"