From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?B?5a6L5paH5q2m?= Newsgroups: gmane.lisp.guile.user,gmane.lisp.guile.devel Subject: [guile-dbi][PATCH] Make installation directory of the dbi.scm configurable. Date: Tue, 28 Apr 2015 21:23:19 +0800 Message-ID: <87mw1stmig.fsf@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1430227395 16637 80.91.229.3 (28 Apr 2015 13:23:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 28 Apr 2015 13:23:15 +0000 (UTC) To: guile-user@gnu.org, guile-devel@gnu.org Original-X-From: guile-user-bounces+guile-user=m.gmane.org@gnu.org Tue Apr 28 15:23:03 2015 Return-path: Envelope-to: guile-user@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Yn5Ta-0001zc-4b for guile-user@m.gmane.org; Tue, 28 Apr 2015 15:23:02 +0200 Original-Received: from localhost ([::1]:33324 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yn5TZ-0007b6-CE for guile-user@m.gmane.org; Tue, 28 Apr 2015 09:23:01 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58537) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yn5TN-0007Zo-RW for guile-user@gnu.org; Tue, 28 Apr 2015 09:22:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yn5TH-0004Hd-RN for guile-user@gnu.org; Tue, 28 Apr 2015 09:22:49 -0400 Original-Received: from mail-pd0-x244.google.com ([2607:f8b0:400e:c02::244]:35826) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yn5TH-0004HX-J6; Tue, 28 Apr 2015 09:22:43 -0400 Original-Received: by pdjg10 with SMTP id g10so44495588pdj.2; Tue, 28 Apr 2015 06:22:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:user-agent:date:message-id:mime-version :content-type; bh=TiQ+PTPQwr6JnC7RXjjRDj8y7XEm09boHhPHu62VJf8=; b=bmzo9LaO7VK3Q/2LbMJ0zaEgizHvubeFR+un72k1lk4TTi0fOPtDGtBwG7Wd35qNs4 UZxxBi8AScFgoiacLsK/l00QsWMz9Duo2+MO54cQ0XqhKVQxpfmiCGc3ybSGGdcVPpjp bhU65yvlsSXBH1BZb2s83icAxluztqQysnkZn1JDL9eqKOBSo3/kCuMHj6W5QyFgNljV 8cNvdeg0Rxd+Gr4cr8WuSlmQThO54je7vzMh2GcJBkqw1inI9ShP/Ro/Ii19jr6wEjC0 DwbLCJLBH8o5EGhtKmdbwzAzJe/IvO/mRjoj5nN6pdwzcovJdaYBIEfY/YnzrlexSq4O VvQA== X-Received: by 10.66.161.102 with SMTP id xr6mr16786353pab.8.1430227362739; Tue, 28 Apr 2015 06:22:42 -0700 (PDT) Original-Received: from localhost ([108.61.250.36]) by mx.google.com with ESMTPSA id u8sm6743176pdi.90.2015.04.28.06.22.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Apr 2015 06:22:41 -0700 (PDT) User-Agent: Notmuch/0.18.1 (http://notmuchmail.org) Emacs/24.5.1 (x86_64-unknown-linux-gnu) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c02::244 X-BeenThere: guile-user@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: General Guile related discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-user-bounces+guile-user=m.gmane.org@gnu.org Original-Sender: guile-user-bounces+guile-user=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.user:11814 gmane.lisp.guile.devel:17713 Archived-At: --=-=-= Content-Type: text/plain 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: --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Don-t-link-with-zlib.patch >From b86334d7f91cb24ccbee6a1ec872db62293040b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= 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 --=-=-= Content-Type: text/plain And this to make Guix packagers's life easier: --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-Make-installation-directory-of-the-dbi-guile-module-.patch >From 8146db0f5fe4dd8f76b92017aaf82d7ab9ced3ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= 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 --=-=-=--