diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-03-18 10:04:10 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-03-18 10:04:10 +0000 |
| commit | b71c87347d6c75557a674e8e5b3ab0c7e63a6820 (patch) | |
| tree | 4f89fa09f2d096da68e86f6ba2b3f1d84086dfbc /devel/libffi/patches | |
| parent | 0ea37745d78a9aef430ac47c53a02e2792c49c47 (diff) | |
| download | pkgsrc-b71c87347d6c75557a674e8e5b3ab0c7e63a6820.tar.gz | |
Disable multilib directories. Fixes packaging issues on at least SunOS
64-bit, possibly others.
Patch from obache.
Diffstat (limited to 'devel/libffi/patches')
| -rw-r--r-- | devel/libffi/patches/patch-aa | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/devel/libffi/patches/patch-aa b/devel/libffi/patches/patch-aa index e0c3751c3c9..b0fe68bd6eb 100644 --- a/devel/libffi/patches/patch-aa +++ b/devel/libffi/patches/patch-aa @@ -1,7 +1,9 @@ -$NetBSD: patch-aa,v 1.15 2013/03/14 19:56:41 drochner Exp $ +$NetBSD: patch-aa,v 1.16 2013/03/18 10:04:11 jperkin Exp $ Extend which ports we accept to deal with. +Disable multilib directories. + --- configure.orig 2013-02-11 19:24:24.000000000 +0000 +++ configure @@ -13329,7 +13329,7 @@ case "$host" in @@ -49,7 +51,19 @@ Extend which ports we accept to deal with. $as_echo "#define FFI_MMAP_EXEC_WRIT 1" >>confdefs.h -@@ -16716,13 +16716,13 @@ s/ [a-zA-Z0-9-]*-all [a-zA-Z0-9-]*-all-a +@@ -14826,11 +14826,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 + + else + toolexeclibdir='$(libdir)' +@@ -16716,13 +16711,13 @@ s/ [a-zA-Z0-9-]*-all [a-zA-Z0-9-]*-all-a /-all-all/d a\\ @ HOST="\$(HOST)\" \\\\\\ |