diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-10 16:16:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-10 16:16:44 +0100 |
| commit | cfc200714ddfa6d76feb836c258b1135d91a8348 (patch) | |
| tree | ecc4628fc161de5044c9acb03bb63b2fd48ae75c /package/libffi | |
| parent | 77bdac14df2e20b290cdd4bcad0ecb0e1fc446be (diff) | |
| parent | 91c8ff1c3f772e0ae8d7c60a3252c5efced9fe92 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/digitemp/Makefile
Diffstat (limited to 'package/libffi')
| -rw-r--r-- | package/libffi/Makefile | 6 | ||||
| -rw-r--r-- | package/libffi/patches/patch-Makefile_am | 11 | ||||
| -rw-r--r-- | package/libffi/patches/patch-include_Makefile_am | 10 |
3 files changed, 3 insertions, 24 deletions
diff --git a/package/libffi/Makefile b/package/libffi/Makefile index d1c71d881..d17d844a8 100644 --- a/package/libffi/Makefile +++ b/package/libffi/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libffi -PKG_VERSION:= 3.0.8 +PKG_VERSION:= 3.0.9 PKG_RELEASE:= 1 -PKG_MD5SUM:= 188a4f79fdac2310044b44b7d3918ef9 +PKG_MD5SUM:= 1f300a7a7f975d4046f51c3022fa5ff1 PKG_DESCR:= Foreign Function Interface library PKG_SECTION:= libs PKG_URL:= http://sourceware.org/libffi @@ -16,7 +16,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= autotool gnu +CONFIGURE_STYLE= gnu BUILD_STYLE= auto INSTALL_STYLE= auto diff --git a/package/libffi/patches/patch-Makefile_am b/package/libffi/patches/patch-Makefile_am deleted file mode 100644 index d53ba2a76..000000000 --- a/package/libffi/patches/patch-Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libffi-3.0.6.orig/Makefile.am 2008-02-21 14:36:18.000000000 +0100 -+++ libffi-3.0.6/Makefile.am 2008-12-08 02:27:27.000000000 +0100 -@@ -68,6 +68,7 @@ AM_MAKEFLAGS = \ - "infodir=$(infodir)" \ - "libdir=$(libdir)" \ - "prefix=$(prefix)" \ -+ "includesdir=$(prefix)/include" \ - "AR=$(AR)" \ - "AS=$(AS)" \ - "CC=$(CC)" \ diff --git a/package/libffi/patches/patch-include_Makefile_am b/package/libffi/patches/patch-include_Makefile_am deleted file mode 100644 index 0b6ad70ab..000000000 --- a/package/libffi/patches/patch-include_Makefile_am +++ /dev/null @@ -1,10 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- libffi-3.0.6.orig/include/Makefile.am 2008-02-14 16:37:00.000000000 +0100 -+++ libffi-3.0.6/include/Makefile.am 2008-12-08 02:20:25.000000000 +0100 -@@ -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 = $(includesdir) - nodist_includes_HEADERS = ffi.h ffitarget.h |