summaryrefslogtreecommitdiff
path: root/source/l/libffi
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/libffi')
-rwxr-xr-xsource/l/libffi/libffi.SlackBuild4
-rw-r--r--source/l/libffi/libffi.includedir.diff50
2 files changed, 27 insertions, 27 deletions
diff --git a/source/l/libffi/libffi.SlackBuild b/source/l/libffi/libffi.SlackBuild
index 1eb06bf4..1d92dbd0 100755
--- a/source/l/libffi/libffi.SlackBuild
+++ b/source/l/libffi/libffi.SlackBuild
@@ -25,13 +25,13 @@
PKGNAM=libffi
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$(uname -m)" in
i?86) ARCH=i486 ;;
- arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
+ arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$(uname -m) ;;
esac
diff --git a/source/l/libffi/libffi.includedir.diff b/source/l/libffi/libffi.includedir.diff
index 966e16d4..edfd0fad 100644
--- a/source/l/libffi/libffi.includedir.diff
+++ b/source/l/libffi/libffi.includedir.diff
@@ -1,36 +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@
+--- ./include/Makefile.in.orig 2014-11-12 05:59:58.000000000 -0600
++++ ./include/Makefile.in 2015-03-18 20:16:10.909912988 -0500
+@@ -314,7 +314,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
+
+--- ./include/Makefile.am.orig 2014-11-08 06:47:24.000000000 -0600
++++ ./include/Makefile.am 2015-03-18 20:14:30.883905771 -0500
+@@ -5,5 +5,5 @@
+ 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.pc.in.orig 2014-11-08 06:47:24.000000000 -0600
++++ ./libffi.pc.in 2015-03-18 20:14:30.884905771 -0500
+@@ -2,10 +2,10 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
+ toolexeclibdir=@toolexeclibdir@
-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
+-Libs: -L${toolexeclibdir} -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
-