diff options
| author |   Akinori Hattori <hattya@gentoo.org> | 2018-07-11 23:29:33 +0900 |
|---|---|---|
| committer | Akinori Hattori <hattya@gentoo.org> | 2018-07-11 23:39:28 +0900 |
| commit | ee0c8fbd905fd91c6933f6da1c2a5fcecaed9eb6 (patch) | |
| tree | 9d292cc4ab263f6e4d6ec3a86f29dc467145fd1f /dev-scheme | |
| parent | dev-scheme/c-wrapper: update patch (diff) | |
| download | gentoo-ee0c8fbd905fd91c6933f6da1c2a5fcecaed9eb6.tar.gz gentoo-ee0c8fbd905fd91c6933f6da1c2a5fcecaed9eb6.tar.bz2 gentoo-ee0c8fbd905fd91c6933f6da1c2a5fcecaed9eb6.zip | |
dev-scheme/c-wrapper: respect CFLAGS
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'dev-scheme')
| -rw-r--r-- | dev-scheme/c-wrapper/c-wrapper-0.6.1.ebuild | 2 | ||||
| -rw-r--r-- | dev-scheme/c-wrapper/files/c-wrapper-gentoo.patch | 51 | ||||
| -rw-r--r-- | dev-scheme/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 974fab710410..864680e0294f 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 000000000000..e94d55fa0d21 --- /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 7f79f642cd06..000000000000 --- 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 - |