[ptxdist] [PATCH] libffi: install header files to /usr/include

[ptxdist] [PATCH] libffi: install header files to /usr/include

[Jan Luebbe]

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 patches/libffi-3.0.11/0001-fix-powerpc-case.patch  |   16 ++++----
 ...der-files-to-includedir-and-adjust-libffi.patch |   39 ++++++++++++++++++++
 patches/libffi-3.0.11/autogen.sh                   |    6 +++
 patches/libffi-3.0.11/series                       |    4 ++
 rules/libffi.make                                  |    1 -
 5 files changed, 58 insertions(+), 8 deletions(-)
 create mode 100644 patches/libffi-3.0.11/0002-install-header-files-to-includedir-and-adjust-libffi.patch
 create mode 100755 patches/libffi-3.0.11/autogen.sh

diff --git a/patches/libffi-3.0.11/0001-fix-powerpc-case.patch b/patches/libffi-3.0.11/0001-fix-powerpc-case.patch
index c596c83..4c5ce2c 100644
--- a/patches/libffi-3.0.11/0001-fix-powerpc-case.patch
+++ b/patches/libffi-3.0.11/0001-fix-powerpc-case.patch
@@ -1,4 +1,6 @@
-libffi: fix duplicate case on powerpc 32 bit
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Thu, 14 Jun 2012 11:44:29 +0200
+Subject: [PATCH] libffi: fix duplicate case on powerpc 32 bit
 
 Without this fix, gcc complains about a duplicate case value:
 
@@ -6,17 +8,17 @@ Without this fix, gcc complains about a duplicate case value:
 ../src/powerpc/ffi.c:670:5: error: duplicate case value
 ../src/powerpc/ffi.c:667:5: error: previously used here
 
+rsc: submitted as http://sourceware.org/ml/libffi-discuss/2012/msg00201.html
+
 Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
 ---
-# rsc: submitted as http://sourceware.org/ml/libffi-discuss/2012/msg00201.html
-
  src/powerpc/ffi.c |    2 ++
  1 file changed, 2 insertions(+)
 
-Index: libffi-3.0.11/src/powerpc/ffi.c
-===================================================================
---- libffi-3.0.11.orig/src/powerpc/ffi.c
-+++ libffi-3.0.11/src/powerpc/ffi.c
+diff --git a/src/powerpc/ffi.c b/src/powerpc/ffi.c
+index baca694..257f02f 100644
+--- a/src/powerpc/ffi.c
++++ b/src/powerpc/ffi.c
 @@ -664,9 +664,11 @@ ffi_prep_cif_machdep (ffi_cif *cif)
    switch (type)
      {
diff --git a/patches/libffi-3.0.11/0002-install-header-files-to-includedir-and-adjust-libffi.patch b/patches/libffi-3.0.11/0002-install-header-files-to-includedir-and-adjust-libffi.patch
new file mode 100644
index 0000000..71bb537
--- /dev/null
+++ b/patches/libffi-3.0.11/0002-install-header-files-to-includedir-and-adjust-libffi.patch
@@ -0,0 +1,39 @@
+From: Jan Luebbe <jlu@pengutronix.de>
+Date: Mon, 22 Oct 2012 18:25:03 +0200
+Subject: [PATCH] install header files to @includedir@ and adjust libffi.pc.in
+
+Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
+---
+ include/Makefile.am |    2 +-
+ libffi.pc.in        |    6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/Makefile.am b/include/Makefile.am
+index fd28024..15301d6 100644
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign
+ DISTCLEANFILES=ffitarget.h
+ EXTRA_DIST=ffi.h.in ffi_common.h
+ 
+-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includesdir = $(includedir)
+ nodist_includes_HEADERS = ffi.h ffitarget.h
+diff --git a/libffi.pc.in b/libffi.pc.in
+index c2e1c7b..684ec32 100644
+--- a/libffi.pc.in
++++ b/libffi.pc.in
+@@ -1,10 +1,10 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includedir=@includedir@
+ 
+ Name: @PACKAGE_NAME@
+ Description: Library supporting Foreign Function Interfaces
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lffi
+-Cflags: -I${includedir}
++Libs: -lffi
++Cflags:
diff --git a/patches/libffi-3.0.11/autogen.sh b/patches/libffi-3.0.11/autogen.sh
new file mode 100755
index 0000000..0244c91
--- /dev/null
+++ b/patches/libffi-3.0.11/autogen.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+
+automake
+
diff --git a/patches/libffi-3.0.11/series b/patches/libffi-3.0.11/series
index 0bc570c..08fb64c 100644
--- a/patches/libffi-3.0.11/series
+++ b/patches/libffi-3.0.11/series
@@ -1 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
 0001-fix-powerpc-case.patch
+0002-install-header-files-to-includedir-and-adjust-libffi.patch
+# 6a4e3935931e0b0433da3a0f41888342  - git-ptx-patches magic
diff --git a/rules/libffi.make b/rules/libffi.make
index d7bfd53..ddfb35a 100644
--- a/rules/libffi.make
+++ b/rules/libffi.make
@@ -41,7 +41,6 @@ LIBFFI_CONF_TOOL := autoconf
 $(STATEDIR)/libffi.install:
 	@$(call targetinfo)
 	@$(call install, LIBFFI)
-	mv "$(LIBFFI_PKGDIR)/usr/lib/$(LIBFFI)/include/"* "$(LIBFFI_PKGDIR)/usr/include"
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
-- 
1.7.10.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de