diff options
| author | Gergely Kiss <mail.gery@gmail.com> | 2016-05-12 12:24:25 +0200 |
|---|---|---|
| committer | Gergely Kiss <mail.gery@gmail.com> | 2016-05-12 12:24:25 +0200 |
| commit | 6527ddb1cea984b34028cb7915019aa51a06901b (patch) | |
| tree | c67ef081453570ddd623a7ed8170ac64d3817dc7 /libs/libffi | |
| parent | 2f86c894de96e30d925450bea22eb59adea5eeec (diff) | |
libffi: do not append multilib suffix (eg. '../lib64') to toolexeclibdir
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
Diffstat (limited to 'libs/libffi')
| -rw-r--r-- | libs/libffi/Makefile | 4 | ||||
| -rw-r--r-- | libs/libffi/patches/002-fix-toolexeclibdir-path.patch | 31 |
2 files changed, 33 insertions, 2 deletions
diff --git a/libs/libffi/Makefile b/libs/libffi/Makefile index 106969cbd..a967d6aca 100644 --- a/libs/libffi/Makefile +++ b/libs/libffi/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2012 OpenWrt.org +# Copyright (C) 2009-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libffi PKG_VERSION:=3.2.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://sourceware.org/pub/libffi/ diff --git a/libs/libffi/patches/002-fix-toolexeclibdir-path.patch b/libs/libffi/patches/002-fix-toolexeclibdir-path.patch new file mode 100644 index 000000000..f79c13233 --- /dev/null +++ b/libs/libffi/patches/002-fix-toolexeclibdir-path.patch @@ -0,0 +1,31 @@ +diff -rupN libffi-3.2.1.orig/configure libffi-3.2.1/configure +--- libffi-3.2.1.orig/configure 2014-11-12 12:59:57.000000000 +0100 ++++ libffi-3.2.1/configure 2016-05-11 17:14:58.606625260 +0200 +@@ -18725,12 +18725,6 @@ if test "x$GCC" = "xyes"; then + toolexecdir="${libdir}"/gcc-lib/'$(target_alias)' + toolexeclibdir="${libdir}" + fi +- multi_os_directory=`$CC $CFLAGS -print-multi-os-directory` +- case $multi_os_directory in +- .) ;; # Avoid trailing /. +- ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; +- esac +- + else + toolexeclibdir="${libdir}" + fi +diff -rupN libffi-3.2.1.orig/configure.ac libffi-3.2.1/configure.ac +--- libffi-3.2.1.orig/configure.ac 2014-11-12 12:56:51.000000000 +0100 ++++ libffi-3.2.1/configure.ac 2016-05-11 17:15:19.694626266 +0200 +@@ -601,11 +601,6 @@ if test "x$GCC" = "xyes"; then + toolexecdir="${libdir}"/gcc-lib/'$(target_alias)' + toolexeclibdir="${libdir}" + fi +- multi_os_directory=`$CC $CFLAGS -print-multi-os-directory` +- case $multi_os_directory in +- .) ;; # Avoid trailing /. +- ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; +- esac + AC_SUBST(toolexecdir) + else + toolexeclibdir="${libdir}" |