From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CA4F7138334 for ; Wed, 11 Jul 2018 14:39:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03D47E081B; Wed, 11 Jul 2018 14:39:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A2A07E0819 for ; Wed, 11 Jul 2018 14:39:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F2E7335CA7 for ; Wed, 11 Jul 2018 14:39:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D2BAC372 for ; Wed, 11 Jul 2018 14:39:42 +0000 (UTC) From: "Akinori Hattori" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" Message-ID: <1531319968.ee0c8fbd905fd91c6933f6da1c2a5fcecaed9eb6.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/c-wrapper/, dev-scheme/c-wrapper/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-scheme/c-wrapper/c-wrapper-0.6.1.ebuild dev-scheme/c-wrapper/files/c-wrapper-gentoo.patch dev-scheme/c-wrapper/files/c-wrapper-system-libffi.patch X-VCS-Directories: dev-scheme/c-wrapper/ dev-scheme/c-wrapper/files/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: ee0c8fbd905fd91c6933f6da1c2a5fcecaed9eb6 X-VCS-Branch: master Date: Wed, 11 Jul 2018 14:39:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bc93cba6-bdd9-4b8d-8525-28920c06d285 X-Archives-Hash: 564c19b3e3bdf90e58e28a369855209e commit: ee0c8fbd905fd91c6933f6da1c2a5fcecaed9eb6 Author: Akinori Hattori gentoo org> AuthorDate: Wed Jul 11 14:29:33 2018 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Wed Jul 11 14:39:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee0c8fbd dev-scheme/c-wrapper: respect CFLAGS Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-scheme/c-wrapper/c-wrapper-0.6.1.ebuild | 2 +- dev-scheme/c-wrapper/files/c-wrapper-gentoo.patch | 51 ++++++++++++++++++++++ .../c-wrapper/files/c-wrapper-system-libffi.patch | 33 -------------- 3 files changed, 52 insertions(+), 34 deletions(-) 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 974fab71041..864680e0294 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.patch ) +PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch ) HTML_DOCS=( doc/${PN}-ref{e,j}.html ) src_prepare() { diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gentoo.patch b/dev-scheme/c-wrapper/files/c-wrapper-gentoo.patch new file mode 100644 index 00000000000..e94d55fa0d2 --- /dev/null +++ b/dev-scheme/c-wrapper/files/c-wrapper-gentoo.patch @@ -0,0 +1,51 @@ +--- 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,10 @@ + 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@ ++CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ +-LIBS = libffi/.libs/libffi.a @LIBS@ ++LIBS = @FFI_LIBS@ @LIBS@ + + YACC = @YACC@ + +@@ -38,7 +39,7 @@ + SCMFILES = + HEADERS = + +-TARGET = libffi/.libs/libffi.a $(ARCHFILES) ++TARGET = $(ARCHFILES) + GENERATED = libffi + CONFIG_GENERATED = libffi/Makefile Makefile cwcompile + +@@ -62,13 +63,13 @@ + cd libffi; $(MAKE) + + c-ffi.$(SOEXT): $(ffi_SRCS) +- $(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-ffi $(ffi_SRCS) ++ $(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-ffi $(ffi_SRCS) + + c-lex.$(SOEXT): $(clex_SRCS) +- $(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-lex $(clex_SRCS) ++ $(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-lex $(clex_SRCS) + + c-parser.$(SOEXT): $(cparser_SRCS) y.tab.c +- $(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS) $(cparser_LIBS)" --verbose c-parser $(cparser_SRCS) ++ $(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS) $(cparser_LIBS)" --verbose c-parser $(cparser_SRCS) + + c-grammar.y: c-grammar.scm genyacc.scm + $(GOSH) genyacc.scm --outfile=c-grammar.y $< diff --git a/dev-scheme/c-wrapper/files/c-wrapper-system-libffi.patch b/dev-scheme/c-wrapper/files/c-wrapper-system-libffi.patch deleted file mode 100644 index 7f79f642cd0..00000000000 --- a/dev-scheme/c-wrapper/files/c-wrapper-system-libffi.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- 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 -