diff options
author | dholland <dholland> | 2008-10-11 22:33:56 +0000 |
---|---|---|
committer | dholland <dholland> | 2008-10-11 22:33:56 +0000 |
commit | 40b6419925f447cb5eaf48c0306cdd92220000de (patch) | |
tree | fd93db6df2b14ad61ef97354d35ae0fb8fece0a6 /devel/libffi | |
parent | 398999eaf4e4059cf0a70bad8ca97eda17ec8d14 (diff) | |
download | pkgsrc-40b6419925f447cb5eaf48c0306cdd92220000de.tar.gz |
Update to libffi-3.0.6. From Aleksej Saushev, who's taking maintainership,
with an adjustment for info file handling.
Changes from 2.x appear to be large and aren't concisely anywhere I
can find. Changes since 3.0.0:
3.0.6 Jul-17-08
Fix for closures on sh.
Mark the sh/sh64 stack as non-executable.
(both thanks to Kaz Kojima)
3.0.5 Apr-3-08
Fix libffi.pc file.
Fix #define ARM for IcedTea users.
Fix x86 closure bug.
3.0.4 Feb-24-08
Fix x86 OpenBSD configury.
3.0.3 Feb-22-08
Enable x86 OpenBSD thanks to Thomas Heller, and
x86-64 FreeBSD thanks to Björn König and Andreas Tobler.
Clean up test instruction in README.
3.0.2 Feb-21-08
Improved x86 FreeBSD support.
Thanks to Björn König.
3.0.1 Feb-15-08
Fix instruction cache flushing bug on MIPS.
Thanks to David Daney.
3.0.0 Feb-15-08
Many changes, mostly thanks to the GCC project.
Cygnus Solutions is now Red Hat.
Diffstat (limited to 'devel/libffi')
-rw-r--r-- | devel/libffi/Makefile | 22 | ||||
-rw-r--r-- | devel/libffi/PLIST | 10 | ||||
-rw-r--r-- | devel/libffi/buildlink3.mk | 7 | ||||
-rw-r--r-- | devel/libffi/distinfo | 12 | ||||
-rw-r--r-- | devel/libffi/patches/patch-aa | 29 | ||||
-rw-r--r-- | devel/libffi/patches/patch-ab | 13 | ||||
-rw-r--r-- | devel/libffi/patches/patch-ac | 15 | ||||
-rw-r--r-- | devel/libffi/patches/patch-ad | 15 |
8 files changed, 58 insertions, 65 deletions
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile index 9aa83bd7e10..31da14034c2 100644 --- a/devel/libffi/Makefile +++ b/devel/libffi/Makefile @@ -1,23 +1,23 @@ -# $NetBSD: Makefile,v 1.7 2008/04/03 09:34:40 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2008/10/11 22:33:56 dholland Exp $ +# -DISTNAME= gcc-3.3.5 -PKGNAME= libffi-2.0beta -PKGREVISION= 2 +DISTNAME= libffi-3.0.6 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-3.3.5/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ftp://sourceware.org/pub/libffi/ -MAINTAINER= pkgsrc-users@NetBSD.org +MAINTAINER= asau@inbox.ru HOMEPAGE= http://sources.redhat.com/libffi/ COMMENT= Foreign function interface PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes -CONFIGURE_ENV+= with_target_subdir=. -CONFIG_GUESS_OVERRIDE= ../config.guess -CONFIG_SUB_OVERRIDE= ../config.sub +CONFIGURE_ARGS= --includedir=${PREFIX}/include +USE_LIBTOOL= yes +USE_TOOLS+= pkg-config +USE_LANGUAGES= c c++ +INFO_FILES= # PLIST -WRKSRC= ${WRKDIR}/${DISTNAME}/libffi +PKGCONFIG_OVERRIDE+= libffi.pc.in .include "../../mk/bsd.pkg.mk" diff --git a/devel/libffi/PLIST b/devel/libffi/PLIST index 74a25bb1e7b..53b7160a305 100644 --- a/devel/libffi/PLIST +++ b/devel/libffi/PLIST @@ -1,5 +1,9 @@ -@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:26 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2008/10/11 22:33:56 dholland Exp $ include/ffi.h -include/ffi_mips.h -include/fficonfig.h +include/ffitarget.h lib/libffi.la +lib/pkgconfig/libffi.pc +man/man3/ffi.3 +man/man3/ffi_call.3 +man/man3/ffi_prep_cif.3 +info/libffi.info diff --git a/devel/libffi/buildlink3.mk b/devel/libffi/buildlink3.mk index 2dbe2f065de..0dae4ba8f42 100644 --- a/devel/libffi/buildlink3.mk +++ b/devel/libffi/buildlink3.mk @@ -1,9 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:44 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2008/10/11 22:33:56 dholland Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBFFI_BUILDLINK3_MK:= ${LIBFFI_BUILDLINK3_MK}+ -.if !empty(BUILDLINK_DEPTH:M+) +.if ${BUILDLINK_DEPTH} == "+" BUILDLINK_DEPENDS+= libffi .endif @@ -11,9 +11,10 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibffi} BUILDLINK_PACKAGES+= libffi BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libffi -.if !empty(LIBFFI_BUILDLINK3_MK:M+) +.if ${LIBFFI_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libffi+= libffi>=1.20 BUILDLINK_ABI_DEPENDS.libffi+= libffi>=2.0betanb1 +#BUILDLINK_API_DEPENDS.libffi+= libffi>=3.0.6 BUILDLINK_PKGSRCDIR.libffi?= ../../devel/libffi .endif # LIBFFI_BUILDLINK3_MK diff --git a/devel/libffi/distinfo b/devel/libffi/distinfo index d72019eb771..4e813c7ba5f 100644 --- a/devel/libffi/distinfo +++ b/devel/libffi/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2008/04/03 09:34:40 joerg Exp $ +$NetBSD: distinfo,v 1.9 2008/10/11 22:33:56 dholland 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) = cef0f1fd24397665aa5120e04e8a539f75f7bf1f -SHA1 (patch-ab) = daa5322cde100b035f195dd0f445755c8285a116 +SHA1 (libffi-3.0.6.tar.gz) = 04a5f38c76dfe3e078767645ca89f2ff71721104 +RMD160 (libffi-3.0.6.tar.gz) = da8f547209e6b13dc7be86ea29ad5fa5e85844e5 +Size (libffi-3.0.6.tar.gz) = 717171 bytes +SHA1 (patch-ac) = 307c08e8e3df5f079c0b2f63da58bb59fc089d30 +SHA1 (patch-ad) = 8901a00abe25422e3e35f321a5fb89311185fc0b diff --git a/devel/libffi/patches/patch-aa b/devel/libffi/patches/patch-aa deleted file mode 100644 index 87001be037b..00000000000 --- a/devel/libffi/patches/patch-aa +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2006/02/26 19:28:28 joerg Exp $ - ---- configure.orig 2004-05-12 15:13:57.000000000 +0000 -+++ configure -@@ -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;; --powerpc-*-linux* | powerpc-*-sysv*) TARGET=POWERPC; TARGETDIR=powerpc;; -+powerpc-*-linux* | powerpc-*-netbsd* | powerpc-*-sysv*) TARGET=POWERPC; TARGETDIR=powerpc;; - powerpc-*-beos*) TARGET=POWERPC; TARGETDIR=powerpc;; - powerpc-*-darwin*) TARGET=POWERPC_DARWIN; TARGETDIR=powerpc;; - powerpc-*-aix*) TARGET=POWERPC_AIX; TARGETDIR=powerpc;; -@@ -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;; -+x86_64-*-netbsd*) TARGET=X86_64; TARGETDIR=x86;; - sh-*-linux* | sh[34]*-*-linux*) TARGET=SH; TARGETDIR=sh;; - esac - diff --git a/devel/libffi/patches/patch-ab b/devel/libffi/patches/patch-ab deleted file mode 100644 index b9e48af2aa4..00000000000 --- a/devel/libffi/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2008/04/03 09:34:40 joerg Exp $ - ---- src/x86/ffi64.c.orig 2008-04-03 11:16:21.000000000 +0200 -+++ src/x86/ffi64.c -@@ -288,7 +288,7 @@ ffi_prep_args (stackLayout *stack, exten - gprcount = ssecount = 0; - if (ecif->cif->rtype->type != FFI_TYPE_VOID - && examine_argument (ecif->cif->rtype, 1, &g, &s) == 0) -- (void *)stack->gpr[gprcount++] = ecif->rvalue; -+ stack->gpr[gprcount++] = (long)ecif->rvalue; - - for (i=ecif->cif->nargs, p_arg=ecif->cif->arg_types, p_argv = ecif->avalue; - i!=0; i--, p_arg++, p_argv++) diff --git a/devel/libffi/patches/patch-ac b/devel/libffi/patches/patch-ac new file mode 100644 index 00000000000..474cc672626 --- /dev/null +++ b/devel/libffi/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.1 2008/10/11 22:33:56 dholland Exp $ + +Install header files in backwards compatible way. + +--- include/Makefile.in.orig 2008-02-14 18:37:00.000000000 +0300 ++++ include/Makefile.in 2008-10-09 12:34:51.000000000 +0400 +@@ -182,7 +182,7 @@ + AUTOMAKE_OPTIONS = foreign + DISTCLEANFILES = ffitarget.h + EXTRA_DIST = ffi.h.in ffi_common.h +-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include ++includesdir = $(includedir) + nodist_includes_HEADERS = ffi.h ffitarget.h + all: all-am + diff --git a/devel/libffi/patches/patch-ad b/devel/libffi/patches/patch-ad new file mode 100644 index 00000000000..514eff5d802 --- /dev/null +++ b/devel/libffi/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.1 2008/10/11 22:33:56 dholland Exp $ + +Install header files in backwards compatible way. + +--- libffi.pc.in.orig 2008-10-09 12:38:02.000000000 +0400 ++++ libffi.pc.in 2008-10-09 12:41:54.000000000 +0400 +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include ++includedir=@includedir@ + + Name: @PACKAGE_NAME@ + Description: Library supporting Foreign Function Interfaces |