From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] libffi: Update to 3.2.1
Date: Mon, 05 Sep 2016 14:27:22 +0200 [thread overview]
Message-ID: <1473078442-29012-1-git-send-email-stefan.schantl@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3442 bytes --]
This is an update to the latest stable version of libffi.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
libffi/libffi.nm | 18 ++++++++++--
.../patches/libffi-3.0.13-fix-include-path.patch | 34 ----------------------
2 files changed, 15 insertions(+), 37 deletions(-)
delete mode 100644 libffi/patches/libffi-3.0.13-fix-include-path.patch
diff --git a/libffi/libffi.nm b/libffi/libffi.nm
index db6ba4f..6990611 100644
--- a/libffi/libffi.nm
+++ b/libffi/libffi.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libffi
-version = 3.0.13
+version = 3.2.1
release = 1
groups = System/Libraries
@@ -13,13 +13,25 @@ license = BSD
summary = A portable foreign function interface library.
description
- The libffi library provides a portable, high level programming \
- interface to various calling conventions. This allows a programmer to \
+ The libffi library provides a portable, high level programming
+ interface to various calling conventions. This allows a programmer to
call any function specified by a call interface description at run time.
end
source_dl = ftp://sourceware.org/pub/libffi/
+build
+ prepare_cmds
+ # Fix include directories.
+ sed -e '/^includesdir/ s/$(libdir).*$/$(includedir)/' \
+ -i include/Makefile.in
+
+ sed -e '/^includedir/ s/=.*$/=@includedir@/' \
+ -e 's/^Cflags: -I${includedir}/Cflags:/' \
+ -i libffi.pc.in
+ end
+end
+
packages
package %{name}
diff --git a/libffi/patches/libffi-3.0.13-fix-include-path.patch b/libffi/patches/libffi-3.0.13-fix-include-path.patch
deleted file mode 100644
index 4502333..0000000
--- a/libffi/patches/libffi-3.0.13-fix-include-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -up libffi-3.0.13/include/Makefile.am.fixpath libffi-3.0.13/include/Makefile.am
---- libffi-3.0.13/include/Makefile.am.fixpath 2013-05-25 22:11:25.983889342 -0400
-+++ libffi-3.0.13/include/Makefile.am 2013-05-25 22:12:12.337890037 -0400
-@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign
- DISTCLEANFILES=ffitarget.h
- EXTRA_DIST=ffi.h.in ffi_common.h
-
--includesdir = $(libdir)/@PACKAGE_NAME(a)-@PACKAGE_VERSION@/include
-+includesdir = $(includedir)/
- nodist_includes_HEADERS = ffi.h ffitarget.h
-diff -up libffi-3.0.13/include/Makefile.in.fixpath libffi-3.0.13/include/Makefile.in
---- libffi-3.0.13/include/Makefile.in.fixpath 2013-05-25 22:12:56.259890696 -0400
-+++ libffi-3.0.13/include/Makefile.in 2013-05-25 22:13:12.101890934 -0400
-@@ -250,7 +250,7 @@ top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign
- DISTCLEANFILES = ffitarget.h
- EXTRA_DIST = ffi.h.in ffi_common.h
--includesdir = $(libdir)/@PACKAGE_NAME(a)-@PACKAGE_VERSION@/include
-+includesdir = $(includedir)/
- nodist_includes_HEADERS = ffi.h ffitarget.h
- all: all-am
-
-diff -up libffi-3.0.13/libffi.pc.in.fixpath libffi-3.0.13/libffi.pc.in
---- libffi-3.0.13/libffi.pc.in.fixpath 2013-05-25 22:14:21.037891968 -0400
-+++ libffi-3.0.13/libffi.pc.in 2013-05-25 22:14:31.652892128 -0400
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=${libdir}/@PACKAGE_NAME(a)-@PACKAGE_VERSION@/include
-+includedir=@includedir@
-
- Name: @PACKAGE_NAME@
- Description: Library supporting Foreign Function Interfaces
--
2.7.4
reply other threads:[~2016-09-05 12:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1473078442-29012-1-git-send-email-stefan.schantl@ipfire.org \
--to=stefan.schantl@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox