From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 5 04:40:17 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4BEC016A41F for ; Wed, 5 Oct 2005 04:40:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B98E043D49 for ; Wed, 5 Oct 2005 04:40:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j954eGBx057988 for ; Wed, 5 Oct 2005 04:40:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j954eGfH057987; Wed, 5 Oct 2005 04:40:16 GMT (envelope-from gnats) Resent-Date: Wed, 5 Oct 2005 04:40:16 GMT Resent-Message-Id: <200510050440.j954eGfH057987@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Erik Greenwald Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ACF0C16A41F for ; Wed, 5 Oct 2005 04:32:30 +0000 (GMT) (envelope-from erik@smluc.org) Received: from phoenix.smluc.org (phoenix.smluc.org [12.28.48.23]) by mx1.FreeBSD.org (Postfix) with ESMTP id A384243D45 for ; Wed, 5 Oct 2005 04:32:29 +0000 (GMT) (envelope-from erik@smluc.org) Received: by phoenix.smluc.org (Postfix, from userid 1000) id D0B851CE45; Tue, 4 Oct 2005 23:32:54 -0500 (CDT) Message-Id: <20051005043254.D0B851CE45@phoenix.smluc.org> Date: Tue, 4 Oct 2005 23:32:54 -0500 (CDT) From: Erik Greenwald To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: erik@math.missouristate.edu Subject: ports/86921: [Maintainer Update] databases/gauche-gdbm link fix, build improvements X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Erik Greenwald List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2005 04:40:17 -0000 >Number: 86921 >Category: ports >Synopsis: [Maintainer Update] databases/gauche-gdbm link fix, build improvements >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Oct 05 04:40:16 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Erik Greenwald >Release: FreeBSD 5.4-RELEASE-p6 i386 >Organization: >Environment: System: FreeBSD fenris 5.4-RELEASE-p6 FreeBSD 5.4-RELEASE-p6 #3: Thu Aug 11 00:13:25 EDT 2005 root@fenris:/usr/obj/usr/src/sys/FENRIS i386 >Description: greatly simplify and speed the build process by doing the steps manually instead of building the lang/gauche wrkdir before starting the module compile. pkg-plist is no longer necessary, using PLIST_FILES in the makefile instead of having two PLIST_SUB lines in the makefile to handle the two files in pkg-plist. forces a link against libgdbm, which SHOULD fix the problem noted in ports/86293 if the issue I was able to replicate was indeed the same one reported... tested on i386 5.4 and 7, using athlons.... assuming the link flags aren't different for other arch's... additional testing/reports greatly welcomed Thanks >How-To-Repeat: >Fix: --- databases_gauche-gdbm.patch begins here --- Index: databases/gauche-gdbm/Makefile =================================================================== RCS file: /home/ncvs/ports/databases/gauche-gdbm/Makefile,v retrieving revision 1.30 diff -u -r1.30 Makefile --- databases/gauche-gdbm/Makefile 26 Jul 2005 08:05:10 -0000 1.30 +++ databases/gauche-gdbm/Makefile 5 Oct 2005 04:22:54 -0000 @@ -7,6 +7,7 @@ PORTNAME= gdbm PORTVERSION= 0.8.5 # Keep this in sync with lang/gauche +PORTREVISION= 1 CATEGORIES= databases scheme MASTER_SITES= # none PKGNAMEPREFIX= gauche- @@ -16,7 +17,7 @@ COMMENT= GDBM interface for Gauche BUILD_DEPENDS= gosh:${PORTSDIR}/${GAUCHE_PORT} \ - ${NONEXISTENT}:${PORTSDIR}/${GAUCHE_PORT}:build + ${NONEXISTENT}:${PORTSDIR}/${GAUCHE_PORT}:patch LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm RUN_DEPENDS= gosh:${PORTSDIR}/${GAUCHE_PORT} @@ -25,9 +26,9 @@ WRKSRC= ${WRKDIR}/dbm MAKE_ARGS= GOSH=gosh \ OPTFLAGS="${CFLAGS} -I${LOCALBASE}/include" -PLIST_SUB= VERSION="${PORTVERSION}" \ - TARGET="${CONFIGURE_TARGET}" USE_REINPLACE= yes +PLIST_FILES= lib/gauche/$(PORTVERSION)/${CONFIGURE_TARGET}/gdbm.so \ + share/gauche/$(PORTVERSION)/lib/dbm/gdbm.scm GUACHE_BUILDDIR=`cd ${PORTSDIR}/${GAUCHE_PORT} && ${MAKE} -V WRKSRC` @@ -35,10 +36,21 @@ ${MKDIR} ${WRKDIR} ${LN} -sf ${GUACHE_BUILDDIR}/ext/dbm ${WRKDIR}/ -do-configure: - cd ${WRKSRC} && make clean && ${REINPLACE_CMD} -e 's/^LIBFILES.*/LIBFILES = gdbm.so/' -e 's/^SCMFILES.*/SCMFILES = gdbm.scm/' Makefile +do-build: + cd ${WRKSRC} && ${LOCALBASE}/bin/gauche-config --fixup-extension gdbm + cd ${WRKSRC} && ${LOCALBASE}/bin/gosh genstub gdbm.stub + cd ${WRKSRC} && $(CC) $(CFLAGS) -c gdbm_head.c + cd ${WRKSRC} && $(CC) $(CFLAGS) -c gdbm_tail.c + cd ${WRKSRC} && $(CC) $(CFLAGS) -c -I${LOCALBASE}/include \ + -I'${LOCALBASE}/lib/gauche/${PORTVERSION}/include' gdbm.c + cd ${WRKSRC} && $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-x -o gdbm.so \ + -Wl,-soname,gdbm.so gdbm.o gdbm_head.o gdbm_tail.o \ + -L${LOCALBASE}/lib -lgdbm do-install: - cd ${WRKSRC} && make install-std + ${INSTALL_PROGRAM} ${WRKSRC}/gdbm.so \ + ${LOCALBASE}/lib/gauche/$(PORTVERSION)/${CONFIGURE_TARGET}/gdbm.so + ${INSTALL_DATA} ${WRKSRC}/gdbm.scm \ + ${LOCALBASE}/share/gauche/$(PORTVERSION)/lib/dbm/gdbm.scm .include Index: databases/gauche-gdbm/pkg-plist =================================================================== RCS file: databases/gauche-gdbm/pkg-plist diff -N databases/gauche-gdbm/pkg-plist --- databases/gauche-gdbm/pkg-plist 21 Aug 2003 09:28:55 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ -lib/gauche/%%VERSION%%/%%TARGET%%/gdbm.so -share/gauche/%%VERSION%%/lib/dbm/gdbm.scm --- databases_gauche-gdbm.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: