summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorsbd <sbd>2012-01-27 08:59:48 +0000
committersbd <sbd>2012-01-27 08:59:48 +0000
commit74aa46e4fd192f419b5a6aa71bd653b6384d133a (patch)
treea966cc0ddf40e641705bf32d628d10cda49c2069 /lang
parent320ffba3936a113319b9df29557585455644e1fd (diff)
downloadpkgsrc-74aa46e4fd192f419b5a6aa71bd653b6384d133a.tar.gz
Remove the section from configure that adds the gcc multi_os_directory to
the libdir.
Diffstat (limited to 'lang')
-rw-r--r--lang/pnet/distinfo4
-rw-r--r--lang/pnet/patches/patch-aa20
2 files changed, 18 insertions, 6 deletions
diff --git a/lang/pnet/distinfo b/lang/pnet/distinfo
index eece2de79eb..5a3bb09e5d8 100644
--- a/lang/pnet/distinfo
+++ b/lang/pnet/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2009/06/02 18:39:20 hasso Exp $
+$NetBSD: distinfo,v 1.9 2012/01/27 08:59:48 sbd Exp $
SHA1 (pnet-0.8.0.tar.gz) = 3d048cbef0476f21cbdd86f81c1706f52b7a7218
RMD160 (pnet-0.8.0.tar.gz) = 232f96fb92be2cab4109ab03845bafa84c3d0259
Size (pnet-0.8.0.tar.gz) = 4510420 bytes
-SHA1 (patch-aa) = a25d25c0b4a1998fa930e7cddc4537beb016be5b
+SHA1 (patch-aa) = 4bc78118a597754b029fa231e4c58dcd0f160f88
SHA1 (patch-ab) = 2df077f95643791d32cff2e4a82b0bc5cd67a01b
diff --git a/lang/pnet/patches/patch-aa b/lang/pnet/patches/patch-aa
index aeb7b978573..d984ed266c9 100644
--- a/lang/pnet/patches/patch-aa
+++ b/lang/pnet/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2009/06/02 18:39:20 hasso Exp $
+$NetBSD: patch-aa,v 1.5 2012/01/27 08:59:49 sbd Exp $
---- libffi/configure.orig 2009-06-02 16:37:36 +0300
-+++ libffi/configure 2009-06-02 16:38:41 +0300
-@@ -20700,6 +20700,7 @@ i*86-*-solaris2.1[0-9]*) TARGET=X86_64;
+--- libffi/configure.orig 2007-03-01 18:57:59.000000000 +0000
++++ libffi/configure
+@@ -20700,6 +20700,7 @@ i*86-*-solaris2.1[0-9]*) TARGET=X86_64;
i*86-*-solaris*) TARGET=X86; TARGETDIR=x86;;
i*86-*-beos*) TARGET=X86; TARGETDIR=x86;;
i*86-*-freebsd* | i*86-*-kfreebsd*-gnu) TARGET=X86; TARGETDIR=x86;;
@@ -19,3 +19,15 @@ $NetBSD: patch-aa,v 1.4 2009/06/02 18:39:20 hasso Exp $
sh-*-linux* | sh[34]*-*-linux*) TARGET=SH; TARGETDIR=sh;;
sh-*-rtems*) TARGET=SH; TARGETDIR=sh;;
sh64-*-linux* | sh5*-*-linux*) TARGET=SH64; TARGETDIR=sh64;;
+@@ -23270,11 +23271,6 @@ else
+ 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
+
+
+