Mercurial > gub
changeset 6441:44376d80c25a
Fix linux-64::libffi
For using /usr/lib instead of /usr/lib64
| author | Masamichi Hosoda <trueroad@trueroad.jp> |
|---|---|
| date | Mon, 23 Nov 2015 23:24:25 +0900 |
| parents | b747a4949dae |
| children | 2c2917119ce3 |
| files | gub/specs/libffi.py patches/libffi-3.2.1-linux-64-libdir.patch |
| diffstat | 2 files changed, 20 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/specs/libffi.py Mon Nov 23 22:31:34 2015 +0900 +++ b/gub/specs/libffi.py Mon Nov 23 23:24:25 2015 +0900 @@ -16,6 +16,12 @@ self.system ('cd %(install_prefix)s && mv lib/libffi-3.2.1/include .') self.system ('cd %(install_prefix)s && rm -rf lib/libffi-3.2.1') +class Libffi__linux__64 (Libffi): + # For using /usr/lib instead of /usr/lib64 + patches = Libffi.patches + [ + 'libffi-3.2.1-linux-64-libdir.patch', + ] + class Libffi__darwin__x86 (Libffi): # darwin-x86 can not compile libffi 3.1, 3.2.1. source = 'ftp://sourceware.org/pub/libffi/libffi-3.0.13.tar.gz'
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/libffi-3.2.1-linux-64-libdir.patch Mon Nov 23 23:24:25 2015 +0900 @@ -0,0 +1,14 @@ +--- libffi-3.2.1/configure.org 2014-11-12 20:59:57.000000000 +0900 ++++ libffi-3.2.1/configure 2015-11-23 23:52:04.472673700 +0900 +@@ -18725,11 +18725,6 @@ + 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}"