[Fedora-directory-commits] dsbuild/ds/db .cvsignore, NONE, 1.1 Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2

Richard Allen Megginson (rmeggins) fedora-directory-commits at redhat.com
Fri Feb 8 21:51:55 UTC 2008


Author: rmeggins

Update of /cvs/dirsec/dsbuild/ds/db
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/db

Modified Files:
	Makefile checksums 
Added Files:
	.cvsignore 
Log Message:
updated for Fedora DS 1.1


--- NEW FILE .cvsignore ---
download
work
cookies


Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/db/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile	10 Feb 2006 15:28:53 -0000	1.1.1.1
+++ Makefile	8 Feb 2008 21:51:53 -0000	1.2
@@ -2,40 +2,37 @@
 GARVERSION = 4.2.52.NC
 CATEGORIES = ds
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-PATCHFILES = 4.2.52.1.diff 4.2.52.2.diff 4.2.52.3.diff 4.2.52.4.diff
+PATCHFILES = 4.2.52.1.diff 4.2.52.2.diff 4.2.52.3.diff 4.2.52.4.diff 4.2.52.5.diff
 
 LIBDEPS = 
 
 DESCRIPTION = db
 
 CONFIGURE_SCRIPTS = custom
-BUILD_SCRIPTS = custom
-INSTALL_SCRIPTS = custom
+BUILD_SCRIPTS = $(WORKSRC)/built/Makefile
+INSTALL_SCRIPTS = $(WORKSRC)/built/Makefile
 
 CONFIGURE_ARGS = --enable-dynamic
 
+CONFIGURE_ENV += LIBSO_LIBS=-lpthread
+
 ifdef DEBUG
 CONFIGURE_ARGS += --enable-debug --enable-umrw
-CONFIGURE_ENV = CFLAGS=-g
 else
 CONFIGURE_ARGS += --disable-debug
-CONFIGURE_ENV = CFLAGS=-O2
 endif
 
-BUILD_ARGS = LIBDB_ARGS="libdb.a"
+BUILD_ARGS = LIBDB_ARGS="libdb-4.2.a"
 
-configure-custom:
+# db does not allow you to run configure directly from the source "dist"
+# directory, so you have to create a "built" directory and copy
+# configure into there
+pre-configure:
 	mkdir -p $(WORKSRC)/built
-	cd $(WORKSRC)/built && $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS)
-	$(MAKECOOKIE)
 
-build-custom:
-	cd $(WORKSRC)/built && $(MAKE) $(BUILD_ARGS)
-	cd $(WORKSRC)/built && rm -f db_archive db_checkpoint db_deadlock \
-	    db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify
-	cd $(WORKSRC)/built && $(MAKE) LDFLAGS="-static " libdb.a all
-
-install-custom:
+configure-custom:
+	@echo ' $(call TMSG_LIB,Running configure in,$(WORKSRC)/built)'
+	cd $(WORKSRC)/built && $(CONFIGURE_ENV) ../dist/configure $(CONFIGURE_ARGS)
 	$(MAKECOOKIE)
 
 include ../../gar.conf.mk


Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/db/checksums,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- checksums	10 Feb 2006 15:28:53 -0000	1.1.1.1
+++ checksums	8 Feb 2008 21:51:53 -0000	1.2
@@ -3,3 +3,4 @@
 1ca0c3556ccfd3af178da2ccc8724ba2  download/4.2.52.2.diff
 f904e0eac44c6cac865de9c33cd4965e  download/4.2.52.3.diff
 9e1bcadecd6a137245ad831bc9021e38  download/4.2.52.4.diff
+de8f8dc57b7d878905910a94330eece5  download/4.2.52.5.diff




More information about the Fedora-directory-commits mailing list