Hi, Guilers!
I'd like to package guile-dbi and guile-dbd-* and artanis finally for
GNU Guix. What's the state of guile-dbi's upstream?
At the first step, here are 2 patches made by 'git format-patch':
It seems to me that zlib is not used at all:
>From b86334d7f91cb24ccbee6a1ec872db62293040b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzs...@gmail.com>
Date: Tue, 28 Apr 2015 20:46:08 +0800
Subject: [PATCH 1/2] Don't link with zlib.
* src/Makefile.am (libguile_dbi_la_LIBADD): Remove '-lz'.
* src/test/Makefile.am (libguile_dbd_test_la_LIBADD): Remove '-lz'.
---
src/Makefile.am | 2 +-
src/test/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 21705c8..a3001db 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,7 +35,7 @@ SUFFIXES = .x
lib_LTLIBRARIES = libguile-dbi.la
libguile_dbi_la_SOURCES = guile-dbi.c guile-dbi.x
-libguile_dbi_la_LIBADD = -ldl -lz $(LIBS)
+libguile_dbi_la_LIBADD = -ldl $(LIBS)
libguile_dbi_la_LDFLAGS = -export-dynamic -version-info @DBI_INTERFACE@
libguile_dbi_la_DEPENDENCIES = $(LTLIBOBJS)
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 22b2e0c..5c9b7bb 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -29,7 +29,7 @@ lib_LTLIBRARIES = libguile-dbd-test.la
libguile_dbd_test_la_SOURCES = guile-dbd-test.c
-libguile_dbd_test_la_LIBADD = -ldl -lz $(LIBS)
+libguile_dbd_test_la_LIBADD = -ldl $(LIBS)
libguile_dbd_test_la_LDFLAGS = -export-dynamic
libguile_dbd_test_la_DEPENDENCIES = $(LTLIBOBJS)
--
2.2.1
And this to make Guix packagers's life easier:
>From 8146db0f5fe4dd8f76b92017aaf82d7ab9ced3ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzs...@gmail.com>
Date: Tue, 28 Apr 2015 20:49:50 +0800
Subject: [PATCH 2/2] Make installation directory of the dbi guile module
configurable.
* configure.ac: New option '--with-guile-site-dir' to set 'guilesitedir'.
* src/dbi/Makefile.am (guiledbidatadir): Use "$(guilesitedir)/dbi".
---
configure.ac | 11 +++++++++++
src/dbi/Makefile.am | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 3bcd764..cc45703 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,12 +63,22 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AC_SUBST([AM_DEFAULT_VERB
CFLAGS=`$GUILECONFIG compile`
LIBS=`$GUILECONFIG link`
+GUILE_SITE=`$GUILECONFIG info sitedir`
+
+AC_ARG_WITH([guile-site-dir],
+ [AS_HELP_STRING([--with-guile-site-dir=DIR],
+ [use the specified installtion path for Guile modules [default=auto]]
+ )],
+ [guilesitedir="$withval"],
+ [guilesitedir="$GUILE_SITE"]
+)
AC_SUBST(DBI_MAJOR_VERSION)
AC_SUBST(DBI_MINOR_VERSION)
AC_SUBST(DBI_MICRO_VERSION)
AC_SUBST(DBI_INTERFACE)
AC_SUBST(VERSION)
+AC_SUBST(guilesitedir)
# Checks for library functions.
@@ -91,6 +101,7 @@ echo "
$PACKAGE-$VERSION
prefix: ${prefix}
+ sitedir: ${guilesitedir}
compiler: ${CC} ${CPPFLAGS} ${CFLAGS}
link: ${LIBS}
"
diff --git a/src/dbi/Makefile.am b/src/dbi/Makefile.am
index 64c6689..d56c9ab 100644
--- a/src/dbi/Makefile.am
+++ b/src/dbi/Makefile.am
@@ -25,7 +25,7 @@
AUTOMAKE_OPTIONS = gnu
-guiledbidatadir = `${GUILECONFIG} info pkgdatadir`/site/dbi
+guiledbidatadir = $(guilesitedir)/dbi
guiledbidata_DATA = dbi.scm
EXTRA_DIST = $(guiledbidata_DATA)
--
2.2.1
