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 | |
| 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.
| -rw-r--r-- | devel/libffi/distinfo | 4 | ||||
| -rw-r--r-- | devel/libffi/patches/patch-aa | 18 |
2 files changed, 18 insertions, 4 deletions
diff --git a/devel/libffi/distinfo b/devel/libffi/distinfo index 98186e2293a..27f5f852062 100644 --- a/devel/libffi/distinfo +++ b/devel/libffi/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.26 2013/03/14 19:56:41 drochner Exp $ +$NetBSD: distinfo,v 1.27 2013/03/18 10:04:10 jperkin Exp $ SHA1 (libffi-3.0.12.tar.gz) = 463dcb4ae9aea4c52bba12b67fbe4d91ed1e21fd RMD160 (libffi-3.0.12.tar.gz) = 9b18efe307200da3e647700013948362d9830cf5 Size (libffi-3.0.12.tar.gz) = 844641 bytes -SHA1 (patch-aa) = 0a6cc24dc4a5ec7d0bb0e5db359e61d39ab75f2d +SHA1 (patch-aa) = 2a36ef7a26fd4a7bcba13f28ccb9226ce00c5c5c SHA1 (patch-ac) = f3c6324f4334d23e684b4eca25173a13be5d37eb SHA1 (patch-ad) = 8901a00abe25422e3e35f321a5fb89311185fc0b SHA1 (patch-ae) = aa53d44c740806d54776530eeb7f7ff245d2022d 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)\" \\\\\\ |