Mon Mar 18 10:04:11 2013 UTC ()
Disable multilib directories.  Fixes packaging issues on at least SunOS
64-bit, possibly others.

Patch from obache.


(jperkin)
diff -r1.26 -r1.27 pkgsrc/devel/libffi/distinfo
diff -r1.15 -r1.16 pkgsrc/devel/libffi/patches/patch-aa
cvs diff -r1.26 -r1.27 pkgsrc/devel/libffi/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libffi/distinfo 2013/03/14 19:56:41 1.26
+++ pkgsrc/devel/libffi/distinfo 2013/03/18 10:04:10 1.27
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.26 2013/03/14 19:56:41 drochner Exp $ 1$NetBSD: distinfo,v 1.27 2013/03/18 10:04:10 jperkin Exp $
2 2
3SHA1 (libffi-3.0.12.tar.gz) = 463dcb4ae9aea4c52bba12b67fbe4d91ed1e21fd 3SHA1 (libffi-3.0.12.tar.gz) = 463dcb4ae9aea4c52bba12b67fbe4d91ed1e21fd
4RMD160 (libffi-3.0.12.tar.gz) = 9b18efe307200da3e647700013948362d9830cf5 4RMD160 (libffi-3.0.12.tar.gz) = 9b18efe307200da3e647700013948362d9830cf5
5Size (libffi-3.0.12.tar.gz) = 844641 bytes 5Size (libffi-3.0.12.tar.gz) = 844641 bytes
6SHA1 (patch-aa) = 0a6cc24dc4a5ec7d0bb0e5db359e61d39ab75f2d 6SHA1 (patch-aa) = 2a36ef7a26fd4a7bcba13f28ccb9226ce00c5c5c
7SHA1 (patch-ac) = f3c6324f4334d23e684b4eca25173a13be5d37eb 7SHA1 (patch-ac) = f3c6324f4334d23e684b4eca25173a13be5d37eb
8SHA1 (patch-ad) = 8901a00abe25422e3e35f321a5fb89311185fc0b 8SHA1 (patch-ad) = 8901a00abe25422e3e35f321a5fb89311185fc0b
9SHA1 (patch-ae) = aa53d44c740806d54776530eeb7f7ff245d2022d 9SHA1 (patch-ae) = aa53d44c740806d54776530eeb7f7ff245d2022d
10SHA1 (patch-af) = 2c7ca79ef980a2561333bf79a18df1ecb0bbb9f7 10SHA1 (patch-af) = 2c7ca79ef980a2561333bf79a18df1ecb0bbb9f7
11SHA1 (patch-ag) = 6333317170f6e92f89db966315276dcd8e3484f2 11SHA1 (patch-ag) = 6333317170f6e92f89db966315276dcd8e3484f2
12SHA1 (patch-ah) = e9580069ede90cd616da7bc230b28acbf5d204a6 12SHA1 (patch-ah) = e9580069ede90cd616da7bc230b28acbf5d204a6
13SHA1 (patch-ai) = f85a6cb64d4a9d7c3e56b47b7092fce10a744b5b 13SHA1 (patch-ai) = f85a6cb64d4a9d7c3e56b47b7092fce10a744b5b
14SHA1 (patch-aj) = d130b2b20b94ca26c70dcc46614e36c6d0ac9153 14SHA1 (patch-aj) = d130b2b20b94ca26c70dcc46614e36c6d0ac9153
15SHA1 (patch-fficonfig.h.in) = fd85fa767bc057c843ff71cc61bedfcff84def43 15SHA1 (patch-fficonfig.h.in) = fd85fa767bc057c843ff71cc61bedfcff84def43
cvs diff -r1.15 -r1.16 pkgsrc/devel/libffi/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/libffi/patches/Attic/patch-aa 2013/03/14 19:56:41 1.15
+++ pkgsrc/devel/libffi/patches/Attic/patch-aa 2013/03/18 10:04:11 1.16
@@ -1,17 +1,19 @@ @@ -1,17 +1,19 @@
1$NetBSD: patch-aa,v 1.15 2013/03/14 19:56:41 drochner Exp $ 1$NetBSD: patch-aa,v 1.16 2013/03/18 10:04:11 jperkin Exp $
2 2
3Extend which ports we accept to deal with. 3Extend which ports we accept to deal with.
4 4
 5Disable multilib directories.
 6
5--- configure.orig 2013-02-11 19:24:24.000000000 +0000 7--- configure.orig 2013-02-11 19:24:24.000000000 +0000
6+++ configure 8+++ configure
7@@ -13329,7 +13329,7 @@ case "$host" in 9@@ -13329,7 +13329,7 @@ case "$host" in
8 TARGET=FRV; TARGETDIR=frv 10 TARGET=FRV; TARGETDIR=frv
9 ;; 11 ;;
10  12
11- hppa*-*-linux* | parisc*-*-linux* | hppa*-*-openbsd*) 13- hppa*-*-linux* | parisc*-*-linux* | hppa*-*-openbsd*)
12+ hppa*-*-linux* | hppa*-*-netbsd* | parisc*-*-linux* | hppa*-*-openbsd*) 14+ hppa*-*-linux* | hppa*-*-netbsd* | parisc*-*-linux* | hppa*-*-openbsd*)
13 TARGET=PA_LINUX; TARGETDIR=pa 15 TARGET=PA_LINUX; TARGETDIR=pa
14 ;; 16 ;;
15 hppa*64-*-hpux*) 17 hppa*64-*-hpux*)
16@@ -13422,7 +13422,7 @@ case "$host" in 18@@ -13422,7 +13422,7 @@ case "$host" in
17 mips-sgi-irix5.* | mips-sgi-irix6.* | mips*-*-rtems*) 19 mips-sgi-irix5.* | mips-sgi-irix6.* | mips*-*-rtems*)
@@ -39,27 +41,39 @@ Extend which ports we accept to deal wit @@ -39,27 +41,39 @@ Extend which ports we accept to deal wit
39+ sh-*-* | shle-*-* | sh[34]*-*-*) 41+ sh-*-* | shle-*-* | sh[34]*-*-*)
40 TARGET=SH; TARGETDIR=sh 42 TARGET=SH; TARGETDIR=sh
41 ;; 43 ;;
42 sh64-*-* | sh5*-*-*) 44 sh64-*-* | sh5*-*-*)
43@@ -14647,7 +14647,7 @@ case "$target" in 45@@ -14647,7 +14647,7 @@ case "$target" in
44 $as_echo "#define FFI_EXEC_TRAMPOLINE_TABLE 1" >>confdefs.h 46 $as_echo "#define FFI_EXEC_TRAMPOLINE_TABLE 1" >>confdefs.h
45  47
46 ;; 48 ;;
47- *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris*) 49- *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris*)
48+ *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-netbsd* | *-*-openbsd* | *-pc-solaris*) 50+ *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-netbsd* | *-*-openbsd* | *-pc-solaris*)
49  51
50 $as_echo "#define FFI_MMAP_EXEC_WRIT 1" >>confdefs.h 52 $as_echo "#define FFI_MMAP_EXEC_WRIT 1" >>confdefs.h
51  53
52@@ -16716,13 +16716,13 @@ s/ [a-zA-Z0-9-]*-all [a-zA-Z0-9-]*-all-a 54@@ -14826,11 +14826,6 @@ if test "x$GCC" = "xyes"; then
 55 toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
 56 toolexeclibdir='$(libdir)'
 57 fi
 58- multi_os_directory=`$CC -print-multi-os-directory`
 59- case $multi_os_directory in
 60- .) ;; # Avoid trailing /.
 61- *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
 62- esac
 63
 64 else
 65 toolexeclibdir='$(libdir)'
 66@@ -16716,13 +16711,13 @@ s/ [a-zA-Z0-9-]*-all [a-zA-Z0-9-]*-all-a
53 /-all-all/d 67 /-all-all/d
54 a\\ 68 a\\
55 @ HOST="\$(HOST)\" \\\\\\ 69 @ HOST="\$(HOST)\" \\\\\\
56- ; test ".\$\$HOST" = "." && HOST=$x sh $ax_enable_builddir_auxdir/config.guess $x \\\\\\ 70- ; test ".\$\$HOST" = "." && HOST=$x sh $ax_enable_builddir_auxdir/config.guess $x \\\\\\
57- ; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\ 71- ; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\
58- ; use=$x basename "\$\@" -all $x; n=$x echo \$\$BUILD | wc -w $x \\\\\\ 72- ; use=$x basename "\$\@" -all $x; n=$x echo \$\$BUILD | wc -w $x \\\\\\
59- ; echo "MAKE \$\$HOST : \$\$n * \$\@"; if test "\$\$n" -eq "0" ; then : \\\\\\ 73- ; echo "MAKE \$\$HOST : \$\$n * \$\@"; if test "\$\$n" -eq "0" ; then : \\\\\\
60- ; BUILD=$x grep "^####.*|" Makefile |tail -1| sed -e 's/.*|//' $x ; fi \\\\\\ 74- ; BUILD=$x grep "^####.*|" Makefile |tail -1| sed -e 's/.*|//' $x ; fi \\\\\\
61+ ; test ".\$\$HOST" = "." && HOST="$x sh $ax_enable_builddir_auxdir/config.guess $x" \\\\\\ 75+ ; test ".\$\$HOST" = "." && HOST="$x sh $ax_enable_builddir_auxdir/config.guess $x" \\\\\\
62+ ; BUILD="$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x" \\\\\\ 76+ ; BUILD="$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x" \\\\\\
63+ ; use="$x basename "\$\@" -all $x"; n="$x echo \$\$BUILD | wc -w $x" \\\\\\ 77+ ; use="$x basename "\$\@" -all $x"; n="$x echo \$\$BUILD | wc -w $x" \\\\\\
64+ ; echo "MAKE \$\$HOST : \$\$n * \$\@"; if test \$\$n = "0" ; then : \\\\\\ 78+ ; echo "MAKE \$\$HOST : \$\$n * \$\@"; if test \$\$n = "0" ; then : \\\\\\
65+ ; BUILD="$x grep "^####.*|" Makefile |tail -1| sed -e 's/.*|//' $x" ; fi \\\\\\ 79+ ; BUILD="$x grep "^####.*|" Makefile |tail -1| sed -e 's/.*|//' $x" ; fi \\\\\\