diff options
| -rw-r--r-- | devel/libffi/Makefile | 3 | ||||
| -rw-r--r-- | devel/libffi/distinfo | 4 | ||||
| -rw-r--r-- | devel/libffi/patches/patch-aa | 19 |
3 files changed, 19 insertions, 7 deletions
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile index e1707623c30..692fae64b3f 100644 --- a/devel/libffi/Makefile +++ b/devel/libffi/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2014/10/28 12:51:03 adam Exp $ +# $NetBSD: Makefile,v 1.25 2014/11/04 21:40:05 joerg Exp $ DISTNAME= libffi-3.1 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://sourceware.org/pub/libffi/ diff --git a/devel/libffi/distinfo b/devel/libffi/distinfo index f7eae607f5f..fe31a0413af 100644 --- a/devel/libffi/distinfo +++ b/devel/libffi/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.35 2014/10/28 12:51:03 adam Exp $ +$NetBSD: distinfo,v 1.36 2014/11/04 21:40:05 joerg Exp $ SHA1 (libffi-3.1.tar.gz) = cb373ef2115ec7c57913b84ca72eee14b10ccdc3 RMD160 (libffi-3.1.tar.gz) = 2445ad6cf9cf42adbd29b9ced4cd29f252864ec5 Size (libffi-3.1.tar.gz) = 937214 bytes -SHA1 (patch-aa) = baa5a812e504ca22af1b2c0b48f280a93f9a27db +SHA1 (patch-aa) = 5aa03c9d2988bf4bbf15d0eb7348a504f2c375ff SHA1 (patch-ac) = f3c6324f4334d23e684b4eca25173a13be5d37eb SHA1 (patch-ad) = 8bb3ec9ea69a8c06b0b1963b3f24018c6384c249 SHA1 (patch-ae) = 3d8cd3bcd834876f6e60ae519dca8c0b0ba0d4d1 diff --git a/devel/libffi/patches/patch-aa b/devel/libffi/patches/patch-aa index 7d1c11ed849..c17bfb07575 100644 --- a/devel/libffi/patches/patch-aa +++ b/devel/libffi/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.21 2014/10/28 12:51:03 adam Exp $ +$NetBSD: patch-aa,v 1.22 2014/11/04 21:40:05 joerg Exp $ --- configure.orig 2014-05-19 13:44:03.000000000 +0000 +++ configure @@ -86,9 +86,16 @@ $NetBSD: patch-aa,v 1.21 2014/10/28 12:51:03 adam Exp $ $as_echo "#define FFI_MMAP_EXEC_WRIT 1" >>confdefs.h -@@ -18792,11 +18806,6 @@ if test "x$GCC" = "xyes"; then +@@ -18787,19 +18801,14 @@ if test "x$GCC" = "xyes"; then + if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + toolexecdir='$(exec_prefix)/$(target_alias)' +- toolexeclibdir='$(toolexecdir)/lib' ++ toolexeclibdir='${toolexecdir}/lib' + else toolexecdir='$(libdir)/gcc-lib/$(target_alias)' - toolexeclibdir='$(libdir)' +- toolexeclibdir='$(libdir)' ++ toolexeclibdir='${libdir}' fi - multi_os_directory=`$CC $CFLAGS -print-multi-os-directory` - case $multi_os_directory in @@ -97,7 +104,11 @@ $NetBSD: patch-aa,v 1.21 2014/10/28 12:51:03 adam Exp $ - esac else - toolexeclibdir='$(libdir)' +- toolexeclibdir='$(libdir)' ++ toolexeclibdir='${libdir}' + fi + + @@ -19115,6 +19124,10 @@ if test -z "${VAX_TRUE}" && test -z "${V as_fn_error $? "conditional \"VAX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 |