diff --git a/packages/devel/libffi/build b/packages/devel/libffi/build index 08f3b805ef..ea2e76e9e6 100755 --- a/packages/devel/libffi/build +++ b/packages/devel/libffi/build @@ -27,6 +27,7 @@ mkdir -p .build-target && cd .build-target ../configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ + --includedir=/usr/include \ --sysconfdir=/etc \ --disable-static \ --enable-shared \ diff --git a/packages/devel/libffi/patches/libffi-3.0.10-includedir.patch b/packages/devel/libffi/patches/libffi-3.0.10-includedir.patch new file mode 100644 index 0000000000..bb709a368c --- /dev/null +++ b/packages/devel/libffi/patches/libffi-3.0.10-includedir.patch @@ -0,0 +1,22 @@ +diff -Naur libffi-3.0.10/include/Makefile.am libffi-3.0.10.patch/include/Makefile.am +--- libffi-3.0.10/include/Makefile.am 2011-08-22 20:38:12.000000000 +0200 ++++ libffi-3.0.10.patch/include/Makefile.am 2011-11-04 09:26:38.587669344 +0100 +@@ -5,5 +5,5 @@ + DISTCLEANFILES=ffitarget.h + EXTRA_DIST=ffi.h.in ffi_common.h + +-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include ++includesdir = $(includedir)/@PACKAGE_NAME@ + nodist_includes_HEADERS = ffi.h ffitarget.h +diff -Naur libffi-3.0.10/libffi.pc.in libffi-3.0.10.patch/libffi.pc.in +--- libffi-3.0.10/libffi.pc.in 2011-08-22 20:38:12.000000000 +0200 ++++ libffi-3.0.10.patch/libffi.pc.in 2011-11-04 09:25:20.218682315 +0100 +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include ++includedir=@includedir@/@PACKAGE_NAME@ + + Name: @PACKAGE_NAME@ + Description: Library supporting Foreign Function Interfaces