From bf8903fa567e5c1b5d923c6f1c0aeb1d2fd1192a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 15 Jun 2014 13:09:33 +0200 Subject: cleanup HOST_STYLE, use SYSROOT feature for pkgconf there are three HOST_STYLE's, not set mean fully automatic installation. auto means prefix is set to /usr and DESTDIR is set to STAGING_HOST_DIR. When using manual, you need to provide your own targets. Instead of using sed to modify *.pc files, use PKG_SYSROOT feature, which does work better and avoids pathcing some pc files. Idea from sh4rm via #musl. --- package/libffi/Makefile | 6 +++--- package/libffi/patches/patch-configure_ac | 14 -------------- package/libffi/patches/patch-include_Makefile_am | 4 ++-- package/libffi/patches/patch-libffi_pc_in | 13 +++++++++---- 4 files changed, 14 insertions(+), 23 deletions(-) delete mode 100644 package/libffi/patches/patch-configure_ac (limited to 'package/libffi') diff --git a/package/libffi/Makefile b/package/libffi/Makefile index 0b1577b74..393e3e5b4 100644 --- a/package/libffi/Makefile +++ b/package/libffi/Makefile @@ -4,12 +4,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libffi -PKG_VERSION:= 3.0.13 +PKG_VERSION:= 3.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 45f3b6dbc9ee7c7dfbbbc5feba571529 +PKG_MD5SUM:= f5898b29bbfd70502831a212d9249d10 PKG_DESCR:= foreign function interface library PKG_SECTION:= libs/misc -PKG_BUILDDEP:= autotool libffi-host +PKG_BUILDDEP:= autotool HOST_BUILDDEP:= autotool PKG_URL:= http://sourceware.org/libffi/ PKG_SITES:= ftp://sourceware.org/pub/libffi/ diff --git a/package/libffi/patches/patch-configure_ac b/package/libffi/patches/patch-configure_ac deleted file mode 100644 index 32be1a3f7..000000000 --- a/package/libffi/patches/patch-configure_ac +++ /dev/null @@ -1,14 +0,0 @@ ---- libffi-3.0.13.orig/configure.ac 2013-03-17 23:36:15.000000000 +0100 -+++ libffi-3.0.13/configure.ac 2013-12-05 15:58:33.000000000 +0100 -@@ -546,11 +546,6 @@ if test "x$GCC" = "xyes"; then - toolexecdir='$(libdir)/gcc-lib/$(target_alias)' - toolexeclibdir='$(libdir)' - fi -- multi_os_directory=`$CC -print-multi-os-directory` -- case $multi_os_directory in -- .) ;; # Avoid trailing /. -- ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; -- esac - AC_SUBST(toolexecdir) - else - toolexeclibdir='$(libdir)' diff --git a/package/libffi/patches/patch-include_Makefile_am b/package/libffi/patches/patch-include_Makefile_am index 1602b5457..0ec4e125c 100644 --- a/package/libffi/patches/patch-include_Makefile_am +++ b/package/libffi/patches/patch-include_Makefile_am @@ -1,5 +1,5 @@ ---- libffi-3.0.13.orig/include/Makefile.am 2013-03-16 12:19:39.000000000 +0100 -+++ libffi-3.0.13/include/Makefile.am 2013-12-05 16:33:48.000000000 +0100 +--- libffi-3.1.orig/include/Makefile.am 2014-04-25 19:45:13.000000000 +0200 ++++ libffi-3.1/include/Makefile.am 2014-06-12 15:22:08.000000000 +0200 @@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign DISTCLEANFILES=ffitarget.h EXTRA_DIST=ffi.h.in ffi_common.h diff --git a/package/libffi/patches/patch-libffi_pc_in b/package/libffi/patches/patch-libffi_pc_in index 55bc4e361..05980c7cc 100644 --- a/package/libffi/patches/patch-libffi_pc_in +++ b/package/libffi/patches/patch-libffi_pc_in @@ -1,11 +1,16 @@ ---- libffi-3.0.9.orig/libffi.pc.in 2009-12-31 13:38:48.000000000 +0100 -+++ libffi-3.0.9/libffi.pc.in 2010-12-11 01:46:04.000000000 +0100 -@@ -1,7 +1,7 @@ +--- libffi-3.1.orig/libffi.pc.in 2014-04-25 19:45:13.000000000 +0200 ++++ libffi-3.1/libffi.pc.in 2014-06-12 17:35:39.000000000 +0200 +@@ -1,11 +1,10 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ +-toolexeclibdir=@toolexeclibdir@ -includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include -+includedir=@includedir@ ++includedir=${prefix}/include Name: @PACKAGE_NAME@ Description: Library supporting Foreign Function Interfaces + Version: @PACKAGE_VERSION@ +-Libs: -L${toolexeclibdir} -lffi ++Libs: -lffi + Cflags: -I${includedir} -- cgit v1.2.3