Browse Source

Merge pull request #2002 from hauke/libffi2

libffi: fix host build
lilik-openwrt-22.03
Hauke Mehrtens 9 years ago
parent
commit
b4ef45b48c
2 changed files with 28 additions and 3 deletions
  1. +1
    -1
      libs/libffi/Makefile
  2. +27
    -2
      libs/libffi/patches/001-fix-includedir-pkg.patch

+ 1
- 1
libs/libffi/Makefile View File

@ -66,7 +66,7 @@ define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) \
$(PKG_INSTALL_DIR)/usr/lib/libffi-$(PKG_VERSION)/include/*.h \
$(PKG_INSTALL_DIR)/usr/include/*.h \
$(1)/usr/include/
endef


+ 27
- 2
libs/libffi/patches/001-fix-includedir-pkg.patch View File

@ -1,11 +1,36 @@
--- a/libffi.pc.in
+++ b/libffi.pc.in
@@ -1,7 +1,7 @@
@@ -1,10 +1,10 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+includedir=${prefix}/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:
--- 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
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -250,7 +250,7 @@ top_srcdir = @top_srcdir@
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
all: all-am

Loading…
Cancel
Save