Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libffi: do not append multilib suffix (eg. '../lib64') to toolexeclibdir

Browse source 
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
This commit is contained in:
Gergely Kiss 2016-05-12 12:24:25 +02:00
parent 2f86c894de
commit 6527ddb1ce
2 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/libffi/Makefile
View file

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libffi PKG_NAME:=libffi
PKG_VERSION:=3.2.1 PKG_VERSION:=3.2.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://sourceware.org/pub/libffi/ PKG_SOURCE_URL:=ftp://sourceware.org/pub/libffi/

31
libs/libffi/patches/002-fix-toolexeclibdir-path.patch Normal file
View file

@ -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}"