summaryrefslogtreecommitdiff
path: root/devel/libffi
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-01-08 20:40:02 +0000
committerjoerg <joerg@pkgsrc.org>2006-01-08 20:40:02 +0000
commit578d3bed5cca29f297ffdf2f68ab507a7a412a79 (patch)
tree6be4b83b645d3b3093e6c5f43ed1e01425654df1 /devel/libffi
parenta2b442c21dddfe232c31fdddb917d1834c0900dc (diff)
downloadpkgsrc-578d3bed5cca29f297ffdf2f68ab507a7a412a79.tar.gz
Override config.guess and config.sub. Add DragonFly.
Diffstat (limited to 'devel/libffi')
-rw-r--r--devel/libffi/Makefile4
-rw-r--r--devel/libffi/distinfo4
-rw-r--r--devel/libffi/patches/patch-aa25
3 files changed, 26 insertions, 7 deletions
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile
index c0a2f74f832..11a4b3c107f 100644
--- a/devel/libffi/Makefile
+++ b/devel/libffi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/03/07 14:54:40 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2006/01/08 20:40:02 joerg Exp $
DISTNAME= gcc-3.3.5
PKGNAME= libffi-2.0beta
@@ -13,6 +13,8 @@ COMMENT= Foreign function interface
GNU_CONFIGURE= yes
CONFIGURE_ENV+= with_target_subdir=.
+CONFIG_GUESS_OVERRIDE= ../config.guess
+CONFIG_SUB_OVERRIDE= ../config.sub
WRKSRC= ${WRKDIR}/${DISTNAME}/libffi
diff --git a/devel/libffi/distinfo b/devel/libffi/distinfo
index bdee1cea563..e0db0e49af6 100644
--- a/devel/libffi/distinfo
+++ b/devel/libffi/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/03/07 14:54:40 wiz Exp $
+$NetBSD: distinfo,v 1.6 2006/01/08 20:40:02 joerg Exp $
SHA1 (gcc-3.3.5.tar.bz2) = ab24a8690040de967c25a1fc8560d7ecc25bd460
RMD160 (gcc-3.3.5.tar.bz2) = 34adf1a6f7ea302e9937c1a06ccf362711e25c58
Size (gcc-3.3.5.tar.bz2) = 23833856 bytes
-SHA1 (patch-aa) = ebdf1f7b8d6b2e7cc0a95f384aff4bb5151a4eae
+SHA1 (patch-aa) = edc4db0796e70d01dcf4d8230a1bb46785bf27f1
diff --git a/devel/libffi/patches/patch-aa b/devel/libffi/patches/patch-aa
index 30a2ef314ac..3abc36737b9 100644
--- a/devel/libffi/patches/patch-aa
+++ b/devel/libffi/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.3 2005/03/07 14:54:40 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2006/01/08 20:40:02 joerg Exp $
---- configure.orig 2004-05-12 17:13:57.000000000 +0200
+--- configure.orig 2004-05-12 15:13:57.000000000 +0000
+++ configure
-@@ -2470,7 +2470,7 @@ ia64*-*-*) TARGET=IA64; TARGETDIR=ia64;;
+@@ -2457,6 +2457,7 @@ i*86-*-sco3.2v5*) TARGET=X86; TARGETDIR=
+ i*86-*-solaris*) TARGET=X86; TARGETDIR=x86;;
+ i*86-*-beos*) TARGET=X86; TARGETDIR=x86;;
+ i*86-*-freebsd*) TARGET=X86; TARGETDIR=x86;;
++i*86-*-dragonfly*) TARGET=X86; TARGETDIR=x86;;
+ i*86-*-netbsdelf*) TARGET=X86; TARGETDIR=x86;;
+ i*86-*-win32*) TARGET=X86_WIN32; TARGETDIR=x86;;
+ i*86-*-cygwin*) TARGET=X86_WIN32; TARGETDIR=x86;;
+@@ -2470,7 +2471,7 @@ ia64*-*-*) TARGET=IA64; TARGETDIR=ia64;;
m68k-*-linux*) TARGET=M68K; TARGETDIR=m68k;;
mips64*-*);;
mips*-*-linux*) TARGET=MIPS_LINUX; TARGETDIR=mips;;
@@ -11,7 +19,7 @@ $NetBSD: patch-aa,v 1.3 2005/03/07 14:54:40 wiz Exp $
powerpc-*-beos*) TARGET=POWERPC; TARGETDIR=powerpc;;
powerpc-*-darwin*) TARGET=POWERPC_DARWIN; TARGETDIR=powerpc;;
powerpc-*-aix*) TARGET=POWERPC_AIX; TARGETDIR=powerpc;;
-@@ -2479,6 +2479,7 @@ arm*-*-linux-*) TARGET=ARM; TARGETDIR=ar
+@@ -2479,6 +2480,7 @@ arm*-*-linux-*) TARGET=ARM; TARGETDIR=ar
s390-*-linux-*) TARGET=S390; TARGETDIR=s390;;
s390x-*-linux-*) TARGET=S390; TARGETDIR=s390;;
x86_64-*-linux*) TARGET=X86_64; TARGETDIR=x86;;
@@ -19,3 +27,12 @@ $NetBSD: patch-aa,v 1.3 2005/03/07 14:54:40 wiz Exp $
sh-*-linux* | sh[34]*-*-linux*) TARGET=SH; TARGETDIR=sh;;
esac
+@@ -3792,6 +3794,8 @@ for ac_option
+ do
+ case "\$ac_option" in
+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++ # Avoid regenerating for rechecks on pkgsrc
++ exit 0
+ echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+ exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+ -version | --version | --versio | --versi | --vers | --ver | --ve | --v)