From e711661be3c9fdaec312d06088c02c6bbc047aef Mon Sep 17 00:00:00 2001 From: Akinori Hattori Date: Tue, 23 Aug 2011 13:30:28 +0000 Subject: [PATCH] use gauche-package to build module. fix undefined reference. Package-Manager: portage-2.1.10.3/cvs/Linux i686 --- dev-scheme/gauche-cdb/ChangeLog | 9 +- dev-scheme/gauche-cdb/Manifest | 13 +- .../gauche-cdb-0.3.1-gauche-package.diff | 133 ++++++++++++++++++ .../gauche-cdb-0.3.1-undefined-reference.diff | 22 +++ .../gauche-cdb/gauche-cdb-0.3.1-r1.ebuild | 29 ++++ dev-scheme/gauche-cdb/gauche-cdb-0.3.1.ebuild | 5 +- 6 files changed, 203 insertions(+), 8 deletions(-) create mode 100644 dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-gauche-package.diff create mode 100644 dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-undefined-reference.diff create mode 100644 dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild diff --git a/dev-scheme/gauche-cdb/ChangeLog b/dev-scheme/gauche-cdb/ChangeLog index 609478d85b87..5684cbb524e3 100644 --- a/dev-scheme/gauche-cdb/ChangeLog +++ b/dev-scheme/gauche-cdb/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-scheme/gauche-cdb # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-cdb/ChangeLog,v 1.10 2011/08/23 13:02:18 hattya Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-cdb/ChangeLog,v 1.11 2011/08/23 13:30:27 hattya Exp $ + +*gauche-cdb-0.3.1-r1 (23 Aug 2011) + + 23 Aug 2011; Akinori Hattori gauche-cdb-0.3.1.ebuild, + +gauche-cdb-0.3.1-r1.ebuild, +files/gauche-cdb-0.3.1-gauche-package.diff, + +files/gauche-cdb-0.3.1-undefined-reference.diff: + use gauche-package to build module. fix undefined reference. 23 Aug 2011; Akinori Hattori gauche-cdb-0.3.1.ebuild, files/gauche-cdb-0.3.1-gpd.diff, files/gauche-cdb-0.3.1-segv.diff: diff --git a/dev-scheme/gauche-cdb/Manifest b/dev-scheme/gauche-cdb/Manifest index dae8211c23e9..64a6b24cbf0a 100644 --- a/dev-scheme/gauche-cdb/Manifest +++ b/dev-scheme/gauche-cdb/Manifest @@ -1,16 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX gauche-cdb-0.3.1-gauche-package.diff 3751 RMD160 5f13fa87f112baa9b5df2f86d22becd202497a9c SHA1 9e336243f83ec87ad672acbe7e85cada49830c27 SHA256 13cec5070740287f813d31f3b943030c2fd437595160325409e781403e5247b6 AUX gauche-cdb-0.3.1-gpd.diff 212 RMD160 7743430bf10f97cc0be109d20211c0b105e3cc67 SHA1 e6679a51a406d6514ece0879ba9a78f73e6fd037 SHA256 30a9a9fc563cc5495dd142c470ba16b2597d1d2850d2c2a54655f0b828351e9a AUX gauche-cdb-0.3.1-segv.diff 309 RMD160 861ade3e2f60e160dcb580b55d16bbca36314426 SHA1 ef88ec59d14059ac7e3c1b2e6f92513f06d129cb SHA256 1f75df7b9699a6652c12bc3962762f2a879a5517a48bd9230f35867533e13073 +AUX gauche-cdb-0.3.1-undefined-reference.diff 709 RMD160 1b836c00bda5b0d12218e2148277b23782de0712 SHA1 c84e79fa04d9682197d495e0d33d53d8ddf0de9d SHA256 3a75d12e86c1c167707188329179953c3d1ac7cb4030b59bbf7ee922a29f72e1 DIST Gauche-cdb-0.3.1.tar.gz 72048 RMD160 16b48710ddaf01b8ccc5c2c0beed47398fcd1426 SHA1 c39cc8cfe17525cd58954c2ff80d06d2ddfcbe90 SHA256 2c050a10e0ab6ee67a6fcb8538bbe7ad7ab11b567b4bc15f921c3f13bbf8f842 -EBUILD gauche-cdb-0.3.1.ebuild 773 RMD160 3e497c58bc25adc4a6de0ed0714cda970c3114e7 SHA1 fcde20c980daadc4c22297c4f102286798ca7682 SHA256 b75b2022ef01155f3681569e953e225bd02474f2d723c8e9bb2a1a18fa2ff883 -MISC ChangeLog 1499 RMD160 a2617279e55a879975a0895cd49755e3841d697e SHA1 2ebdfe525dc4cfe362355e9087d4945a96546421 SHA256 95388c00d87cb2903720857bee6ed07c87441b91a0fab0ac5e8f461572a5fbb4 +EBUILD gauche-cdb-0.3.1-r1.ebuild 705 RMD160 db91c66078cfee8d539b0e73db1f4a9ca3f3ccbb SHA1 6ee9403f98257c0b1396be7448f94362df981479 SHA256 523d0d7e7043313e55c6de38e82703cde3f25a6db66f007ce2b896cfa3a0dd4b +EBUILD gauche-cdb-0.3.1.ebuild 812 RMD160 8709fbaaa7f41b40557078cff3241de329569cb8 SHA1 d2481f11c36676b36b650dae83c78bc5d736101f SHA256 7538df4f6782a1052c2e5167ae88175ec9ae0d8763fb07f6959b58a13b98c512 +MISC ChangeLog 1803 RMD160 7c0c8bca9d2e4527b89e58f64f28a4dae845273c SHA1 22c38a4f3a202371f4b97b98aa389935b34fda7e SHA256 717d05579ad988961eb2ea1ae87fbd4aa66bb45d92a43ec4d2b0cfe921120aaa MISC metadata.xml 230 RMD160 8e45109dbaf3c193afdb318002c1def7cb62dfa1 SHA1 9bd7aea9376c216b3f55303d1334a337cd6f06a2 SHA256 87fc07a55ee7814a0505ae1c24a871ac29ae7691c5383550647382a2b26277ae -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk5TpOYACgkQL46suuyRem2SBgCgjKOyazc52y066f1y1C5OHrzt -Y7IAoJ8U0qsD+FuYtl5rBABGHzkFy+M2 -=yo7C +iEYEARECAAYFAk5Tq4AACgkQL46suuyRem1CsQCgmOFFRgaTGDWx/xDJb/zgizza +g08Ani4OZG9tggmC+//bAmBMlyOm2zMP +=09jn -----END PGP SIGNATURE----- diff --git a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-gauche-package.diff b/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-gauche-package.diff new file mode 100644 index 000000000000..ae093062243d --- /dev/null +++ b/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-gauche-package.diff @@ -0,0 +1,133 @@ +--- Gauche-cdb-0.3.1.orig/Makefile.in ++++ Gauche-cdb-0.3.1/Makefile.in +@@ -10,76 +10,57 @@ + VPATH = $(srcdir) + + # These may be overridden by make invocators +-DESTDIR = +-OPTFLAGS = @OPTFLAGS@ +-CC = @CC@ +-LIBS = @LIBS@ +-CFLAGS = @CFLAGS@ +-CPPFLAGS = @CPPFLAGS@ # AC_LIB_LINKFLAGS adds to this.. +-LDFLAGS = @LDFLAGS@ +-INSTALL = @INSTALL@ +-INSTALL_TYPE = @INSTALL_TYPE@ +- +-# Set by configure +-GOSH = @GOSH@ +-GAUCHE_CONFIG = @GAUCHE_CONFIG@ ++DESTDIR = ++CPPFLAGS = @CPPFLAGS@ # AC_LIB_LINKFLAGS adds to this.. ++GOSH = "@GOSH@" ++GAUCHE_CONFIG = "@GAUCHE_CONFIG@" ++GAUCHE_PACKAGE = "@GAUCHE_PACKAGE@" ++INSTALL = "@GAUCHE_INSTALL@" ++ ++# Other parameters ++SOEXT = @SOEXT@ + OBJEXT = @OBJEXT@ +-DSOEXT = @SOEXT@ ++EXEEXT = @EXEEXT@ + +-MODULE = cdb ++# Module-specific stuff ++PACKAGE = cdb + +-ARCHFILES = $(MODULE).$(DSOEXT) +-SCMFILES = $(MODULE).scm ++ARCHFILES = $(PACKAGE).$(SOEXT) ++SCMFILES = $(PACKAGE).scm + HEADERS = + + TARGET = $(ARCHFILES) +-OBJS = $(MODULE)_head.$(OBJEXT) \ +- cdb.$(OBJEXT) \ +- $(MODULE)_tail.$(OBJEXT) +-GENERATED = cdb.c $(MODULE)_head.c $(MODULE)_tail.c ++GENERATED = + CONFIG_GENERATED = Makefile config.cache config.log config.status \ +- configure.lineno autom4te*.cache +- +-HEADER_INSTALL_DIR = $(DESTDIR)/`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)incdir` +-SCM_INSTALL_DIR = $(DESTDIR)/`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)libdir`/dbm +-ARCH_INSTALL_DIR = $(DESTDIR)/`$(GAUCHE_CONFIG) --$(INSTALL_TYPE)archdir` +- +-all : $(TARGET) +- +-.SUFFIXES: .o .stub ++ configure.lineno autom4te*.cache @PACKAGE_NAME@.gpd + +-.c.o: +- $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ ++HEADER_INSTALL_DIR = "$(DESTDIR)`$(GAUCHE_CONFIG) --siteincdir`" ++SCM_INSTALL_DIR = "$(DESTDIR)`$(GAUCHE_CONFIG) --sitelibdir`" ++ARCH_INSTALL_DIR = "$(DESTDIR)`$(GAUCHE_CONFIG) --sitearchdir`" + +-.stub.c: +- $(GOSH) genstub $< ++cdb_SRCS = cdb.stub ++cdb_LIBS = @LIBCDB@ + +-$(MODULE).$(DSOEXT): $(OBJS) +- $(CC) -Wl,-rpath -Wl,`gauche-config --sysarchdir` $(LDFLAGS) $(MODULE).$(DSOEXT) $(OBJS) $(LIBS) @LIBCDB@ ++all : $(TARGET) + +-$(MODULE)_head.c $(MODULE)_tail.c : +- $(GAUCHE_CONFIG) --fixup-extension $(MODULE) ++$(PACKAGE).$(SOEXT): $(cdb_SRCS) ++ $(GAUCHE_PACKAGE) compile --verbose \ ++ --libs="$(cdb_LIBS)" --cppflags="$(CPPFLAGS)" \ ++ $(PACKAGE) $(cdb_SRCS) + + check : all + @rm -f test.log + $(GOSH) -I. test.scm > test.log + + install : all +- if test ! -z "$(HEADERS)"; then \ +- $(INSTALL) -d $(HEADER_INSTALL_DIR); \ +- $(INSTALL) -m 444 $(HEADERS) $(HEADER_INSTALL_DIR); \ +- fi +- if test ! -z "$(SCMFILES)"; then \ +- $(INSTALL) -d $(SCM_INSTALL_DIR); \ +- $(INSTALL) -m 444 $(SCMFILES) $(SCM_INSTALL_DIR); \ +- fi +- if test ! -z "$(ARCHFILES)"; then \ +- $(INSTALL) -d $(ARCH_INSTALL_DIR); \ +- $(INSTALL) -m 555 $(ARCHFILES) $(ARCH_INSTALL_DIR); \ +- fi ++ $(INSTALL) -m 444 -T $(HEADER_INSTALL_DIR) $(HEADERS) ++ $(INSTALL) -m 444 -T $(SCM_INSTALL_DIR)/dbm $(SCMFILES) ++ $(INSTALL) -m 555 -T $(ARCH_INSTALL_DIR) $(ARCHFILES) ++ $(INSTALL) -m 444 -T $(SCM_INSTALL_DIR)/.packages @PACKAGE_NAME@.gpd + + clean : +- rm -rf core $(TARGET) $(OBJS) $(GENERATED) *~ test.log so_locations ++ $(GAUCHE_PACKAGE) compile --clean $(PACKAGE) $(cdb_SRCS) ++ rm -rf core $(TARGET) $(GENERATED) *~ test.log so_locations + + distclean : clean + rm -rf $(CONFIG_GENERATED) +--- Gauche-cdb-0.3.1.orig/configure.ac ++++ Gauche-cdb-0.3.1/configure.ac +@@ -4,18 +4,11 @@ + AC_INIT(Gauche-cdb, 0.3.1) + AC_CONFIG_SRCDIR(cdb.stub) + +-AC_CANONICAL_SYSTEM +- + AC_GAUCHE_INIT_EXT +-AC_GAUCHE_INSTALL_TYPE(site) + AC_GAUCHE_CC +-AC_GAUCHE_FLAGS +- +-AC_PROG_INSTALL + + AC_LIB_LINKFLAGS(cdb) + +-AC_GAUCHE_FIX_LIBS +- ++AC_GAUCHE_MAKE_GPD + echo $PACKAGE_VERSION > VERSION + AC_OUTPUT(Makefile) diff --git a/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-undefined-reference.diff b/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-undefined-reference.diff new file mode 100644 index 000000000000..b63a68ddbda2 --- /dev/null +++ b/dev-scheme/gauche-cdb/files/gauche-cdb-0.3.1-undefined-reference.diff @@ -0,0 +1,22 @@ +--- Gauche-cdb-0.3.1.orig/cdb.scm ++++ Gauche-cdb-0.3.1/cdb.scm +@@ -60,7 +60,7 @@ + (unless (slot-bound? self 'path) + (error "path must be set to open cdb database")) + (when (cdb-file-of self) +- (errorf "cdb ~S already opened" cdb)) ++ (errorf "cdb ~s already opened" (cdb-file-of self))) + (let ((path (slot-ref self 'path)) + (rwmode (slot-ref self 'rw-mode))) + (case rwmode +--- Gauche-cdb-0.3.1.orig/cdb.stub ++++ Gauche-cdb-0.3.1/cdb.stub +@@ -69,7 +69,7 @@ + + static void cdb_finalize(ScmObj obj, void *data) + { +- ScmCdb *cdb = SCM_CDB(cdb); ++ ScmCdb *cdb = SCM_CDB(obj); + switch (cdb->status) { + case OPEN_QUERY: + cdb_free(&cdb->cdb); close(cdb_fileno(&cdb->cdb)); diff --git a/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild b/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild new file mode 100644 index 000000000000..06fd20bdc9c9 --- /dev/null +++ b/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-cdb/gauche-cdb-0.3.1-r1.ebuild,v 1.1 2011/08/23 13:30:27 hattya Exp $ + +EAPI="4" + +inherit autotools eutils + +MY_P="${P/g/G}" + +DESCRIPTION="CDB binding for Gauche" +HOMEPAGE="http://sourceforge.jp/projects/gauche/" +SRC_URI="mirror://sourceforge.jp/gauche/8407/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~ia64 ~x86" +IUSE="" + +RDEPEND="dev-scheme/gauche + dev-db/tinycdb" +DEPEND="${RDEPEND}" +S="${WORKDIR}/${MY_P}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-gauche-package.diff + epatch "${FILESDIR}"/${P}-undefined-reference.diff + eautoreconf +} diff --git a/dev-scheme/gauche-cdb/gauche-cdb-0.3.1.ebuild b/dev-scheme/gauche-cdb/gauche-cdb-0.3.1.ebuild index 7a52126b601f..e7e8b544bd1a 100644 --- a/dev-scheme/gauche-cdb/gauche-cdb-0.3.1.ebuild +++ b/dev-scheme/gauche-cdb/gauche-cdb-0.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-cdb/gauche-cdb-0.3.1.ebuild,v 1.11 2011/08/23 13:02:18 hattya Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche-cdb/gauche-cdb-0.3.1.ebuild,v 1.12 2011/08/23 13:30:27 hattya Exp $ EAPI="4" @@ -23,7 +23,8 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_P}" src_prepare() { - epatch "${FILESDIR}"/${P}-*.diff + epatch "${FILESDIR}"/${P}-gpd.diff + epatch "${FILESDIR}"/${P}-segv.diff eautoreconf } -- 2.26.2