From 89570e7adc06af18dc3a80d4c50ce16e2fa5568b Mon Sep 17 00:00:00 2001 From: Akinori Hattori Date: Wed, 11 Jul 2018 23:27:58 +0900 Subject: dev-scheme/c-wrapper: update patch Package-Manager: Portage-2.3.40, Repoman-2.3.9 --- dev-scheme/c-wrapper/c-wrapper-0.6.1.ebuild | 2 +- .../c-wrapper/files/c-wrapper-system-libffi.diff | 33 ---------------------- .../c-wrapper/files/c-wrapper-system-libffi.patch | 33 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 dev-scheme/c-wrapper/files/c-wrapper-system-libffi.diff create mode 100644 dev-scheme/c-wrapper/files/c-wrapper-system-libffi.patch (limited to 'dev-scheme') diff --git a/dev-scheme/c-wrapper/c-wrapper-0.6.1.ebuild b/dev-scheme/c-wrapper/c-wrapper-0.6.1.ebuild index 2c6bcb40a192..974fab710410 100644 --- a/dev-scheme/c-wrapper/c-wrapper-0.6.1.ebuild +++ b/dev-scheme/c-wrapper/c-wrapper-0.6.1.ebuild @@ -18,7 +18,7 @@ RDEPEND="dev-scheme/gauche virtual/libffi" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${PN}-system-libffi.diff ) +PATCHES=( "${FILESDIR}"/${PN}-system-libffi.patch ) HTML_DOCS=( doc/${PN}-ref{e,j}.html ) src_prepare() { diff --git a/dev-scheme/c-wrapper/files/c-wrapper-system-libffi.diff b/dev-scheme/c-wrapper/files/c-wrapper-system-libffi.diff deleted file mode 100644 index 7ee9a4011ef3..000000000000 --- a/dev-scheme/c-wrapper/files/c-wrapper-system-libffi.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- c-wrapper-0.6.1.orig/configure.ac -+++ c-wrapper-0.6.1/configure.ac -@@ -53,6 +53,7 @@ - - dnl Check for libraries - dnl Add your macro calls to check required libraries, if you have any. -+PKG_CHECK_MODULES([FFI], [libffi]) - - dnl Platform-dependent configuration. - AC_ARG_ENABLE(objc, [ --enable-objc turn on Objective-C support]) ---- c-wrapper-0.6.1.orig/src/Makefile.in -+++ c-wrapper-0.6.1/src/Makefile.in -@@ -20,9 +20,9 @@ - GAUCHE_PACKAGE = @GAUCHE_PACKAGE@ - INSTALL = @GAUCHE_INSTALL@ - --CPPFLAGS = -I./libffi/include -DGAUCHE_API_0_8_8 @CPPFLAGS@ -+CPPFLAGS = -DGAUCHE_API_0_8_8 @FFI_CFLAGS@ @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --LIBS = libffi/.libs/libffi.a @LIBS@ -+LIBS = @FFI_LIBS@ @LIBS@ - - YACC = @YACC@ - -@@ -38,7 +38,7 @@ - SCMFILES = - HEADERS = - --TARGET = libffi/.libs/libffi.a $(ARCHFILES) -+TARGET = $(ARCHFILES) - GENERATED = libffi - CONFIG_GENERATED = libffi/Makefile Makefile cwcompile - diff --git a/dev-scheme/c-wrapper/files/c-wrapper-system-libffi.patch b/dev-scheme/c-wrapper/files/c-wrapper-system-libffi.patch new file mode 100644 index 000000000000..7f79f642cd06 --- /dev/null +++ b/dev-scheme/c-wrapper/files/c-wrapper-system-libffi.patch @@ -0,0 +1,33 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -53,6 +53,7 @@ + + dnl Check for libraries + dnl Add your macro calls to check required libraries, if you have any. ++PKG_CHECK_MODULES([FFI], [libffi]) + + dnl Platform-dependent configuration. + AC_ARG_ENABLE(objc, [ --enable-objc turn on Objective-C support]) +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -20,9 +20,9 @@ + GAUCHE_PACKAGE = @GAUCHE_PACKAGE@ + INSTALL = @GAUCHE_INSTALL@ + +-CPPFLAGS = -I./libffi/include -DGAUCHE_API_0_8_8 @CPPFLAGS@ ++CPPFLAGS = -DGAUCHE_API_0_8_8 @FFI_CFLAGS@ @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ +-LIBS = libffi/.libs/libffi.a @LIBS@ ++LIBS = @FFI_LIBS@ @LIBS@ + + YACC = @YACC@ + +@@ -38,7 +38,7 @@ + SCMFILES = + HEADERS = + +-TARGET = libffi/.libs/libffi.a $(ARCHFILES) ++TARGET = $(ARCHFILES) + GENERATED = libffi + CONFIG_GENERATED = libffi/Makefile Makefile cwcompile + -- cgit v1.2.3-18-g5258