From d30b3d993ab1dbd557f7daf200c071861565caf7 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 11 May 2010 19:06:24 +0200 Subject: [PATCH] libffi: update to 3.0.9. --- srcpkgs/libffi/libffi-devel.template | 3 +-- srcpkgs/libffi/patches/fix_includedir_path.diff | 17 +++++++++++++---- srcpkgs/libffi/template | 8 ++++---- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/srcpkgs/libffi/libffi-devel.template b/srcpkgs/libffi/libffi-devel.template index 9b74b0a356..80e0880810 100644 --- a/srcpkgs/libffi/libffi-devel.template +++ b/srcpkgs/libffi/libffi-devel.template @@ -5,8 +5,7 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=1 - +Add_dependency run glibc-devel Add_dependency run libffi do_install() diff --git a/srcpkgs/libffi/patches/fix_includedir_path.diff b/srcpkgs/libffi/patches/fix_includedir_path.diff index 28314c0896..598edef906 100644 --- a/srcpkgs/libffi/patches/fix_includedir_path.diff +++ b/srcpkgs/libffi/patches/fix_includedir_path.diff @@ -1,11 +1,20 @@ ---- include/Makefile.in.orig 2009-11-17 03:20:27.967671016 +0100 -+++ include/Makefile.in 2009-11-17 03:21:20.354047994 +0100 -@@ -185,7 +185,7 @@ top_srcdir = @top_srcdir@ +--- include/Makefile.in.orig 2010-05-11 19:03:20.645903854 +0200 ++++ include/Makefile.in 2010-05-11 19:04:02.930565181 +0200 +@@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acin + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(install_sh) -d +-CONFIG_HEADER = $(top_builddir)/fficonfig.h ++CONFIG_HEADER = $(builddir)/fficonfig.h + CONFIG_CLEAN_FILES = ffi.h ffitarget.h + CONFIG_CLEAN_VPATH_FILES = + SOURCES = +@@ -203,7 +203,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 = @prefix@/include - nodist_includes_HEADERS = ffi.h ffitarget.h + nodist_includes_HEADERS = ffi.h ffitarget.h all: all-am diff --git a/srcpkgs/libffi/template b/srcpkgs/libffi/template index 51fe0836fd..493a47e805 100644 --- a/srcpkgs/libffi/template +++ b/srcpkgs/libffi/template @@ -1,12 +1,12 @@ # Template file for 'libffi' pkgname=libffi -version=3.0.8 -revision=1 +version=3.0.9 distfiles="ftp://sourceware.org/pub/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure +configure_args="--includedir=/usr/include" short_desc="Library supporting Foreign Function Interfaces" maintainer="Juan RP " -checksum=2c7c5b88a68fb362262889ba25ef25dc27864b7bbf03547a8a36b8d567569406 +checksum=589d25152318bc780cd8919b14670793f4971d9838dab46ed38c32b3ee92c452 long_desc=" The libffi library provides a portable, high level programming interface to various calling conventions. This allows a programmer to @@ -27,5 +27,5 @@ long_desc=" between the two languages." subpackages="$pkgname-devel" -Add_dependency full glibc +Add_dependency run glibc Add_dependency build texinfo