use gauche-package to build module. fix undefined reference.

(Portage version: 2.1.10.3/cvs/Linux i686)

5 files changed, 195 insertions, 3 deletions

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 <hattya@gentoo.org> 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 <hattya@gentoo.org> 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/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
 }