diff options
Diffstat (limited to 'source/l/libffi')
| -rwxr-xr-x | source/l/libffi/libffi.SlackBuild | 7 | ||||
| -rw-r--r-- | source/l/libffi/libffi.includedir.diff | 36 |
2 files changed, 41 insertions, 2 deletions
diff --git a/source/l/libffi/libffi.SlackBuild b/source/l/libffi/libffi.SlackBuild index c1a2e848b..1eb06bf44 100755 --- a/source/l/libffi/libffi.SlackBuild +++ b/source/l/libffi/libffi.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for libffi # Copyright 2011,2012 Robby Workman, Northport, Alabama, USA -# Copyright 2012 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ PKGNAM=libffi VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -62,6 +62,9 @@ cd $TMP rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 cd $PKGNAM-$VERSION + +zcat $CWD/libffi.includedir.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/l/libffi/libffi.includedir.diff b/source/l/libffi/libffi.includedir.diff new file mode 100644 index 000000000..966e16d4b --- /dev/null +++ b/source/l/libffi/libffi.includedir.diff @@ -0,0 +1,36 @@ +--- libffi-3.0.11~rc1.orig/libffi.pc.in ++++ libffi-3.0.11~rc1/libffi.pc.in +@@ -1,10 +1,10 @@ + 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 + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lffi +-Cflags: -I${includedir} ++Libs: -lffi ++Cflags: +--- libffi-3.0.11~rc1.orig/include/Makefile.am ++++ libffi-3.0.11~rc1/include/Makefile.am +@@ -5,5 +5,5 @@ 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 +--- libffi-3.0.11~rc1.orig/include/Makefile.in ++++ libffi-3.0.11~rc1/include/Makefile.in +@@ -211,7 +211,7 @@ top_srcdir = @top_srcdir@ + 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 + |