gunnar: server/make-helper openpkg-patched.mk, 1.3, 1.4 package-new.mk, 1.1, 1.2 package.mk, 1.4, 1.5

cvs at kolab.org cvs at kolab.org
Tue Jan 5 17:24:57 CET 2010


Author: gunnar

Update of /kolabrepository/server/make-helper
In directory doto:/tmp/cvs-serv25158/make-helper

Modified Files:
	openpkg-patched.mk package-new.mk package.mk 
Log Message:
MFB: Fixed cflags for amd64 systems.  Related to: kolab/issue2982 (OpenLDAP segmentation fault on 64bit). In addition: Updated build system to use the make helper scripts.

Index: openpkg-patched.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/openpkg-patched.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- openpkg-patched.mk	5 Jan 2010 12:58:43 -0000	1.3
+++ openpkg-patched.mk	5 Jan 2010 16:24:55 -0000	1.4
@@ -20,11 +20,11 @@
 	touch $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched
 
 # Target for building the source package
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched
+$(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec
 
 # Target for building the binary package
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec $(BUILD_OPTIONS)
 
 # Prepare the patch for the package.

Index: package-new.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/package-new.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- package-new.mk	5 Jan 2010 12:58:43 -0000	1.1
+++ package-new.mk	5 Jan 2010 16:24:55 -0000	1.2
@@ -3,11 +3,11 @@
 	mkdir -p $(KOLABRPMSRC)/$(PACKAGE)
 
 # Target for the src rpm spec file.
-$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: $(KOLABRPMSRC)/$(PACKAGE)
+$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: $(KOLABRPMSRC)/$(PACKAGE) $(EXTRA)
 	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
 
 # Target for building the source package
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
+$(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec
 
 # Target for building the binary package

Index: package.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/package.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- package.mk	5 Jan 2010 12:58:43 -0000	1.4
+++ package.mk	5 Jan 2010 16:24:55 -0000	1.5
@@ -1,17 +1,21 @@
+ifeq ($(RELEASETARGET),)
+RELEASETARGET=$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+endif
+
 # Default target to generate the source rpm package
 .PHONY: all
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+all: $(RELEASETARGET)
 
 # Target for placing the source rpm in the staging area. This target
 # includes building the binary package which is an additional check for
 # the final release. Thus it is the default target.
 .PHONY: dist
-dist: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(STAGING)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+dist: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(STAGING)/$(RELEASETARGET)
 
 # Target for placing the source rpm in the staging area. This is the soft
 # variant that is quicker and omits the binary package.
 .PHONY: sdist
-sdist: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+sdist: $(RELEASETARGET)
 
 # Target for installing the binary rpm package in our current Kolab
 # server installation
@@ -24,16 +28,16 @@
 clean:
 	rm -rf $(KOLABRPMSRC)/$(PACKAGE)
 	rm -rf $(KOLABRPMTMP)/$(PACKAGE)*
-	rm -f $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	rm -f $(KOLABRPMPKG)/$(RELEASETARGET)
 	rm -f $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
-	rm -f $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	rm -f *.tar.gz
+	rm -f $(RELEASETARGET)
+	rm -f *.tar.gz *.tgz *.tar.bz2
 	rm -f *~
 	rm -f package.patch
 
 # Target for fetching the source rpm into the current directory
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	cp $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+$(RELEASETARGET): $(KOLABRPMPKG)/$(RELEASETARGET)
+	cp $(KOLABRPMPKG)/$(RELEASETARGET) .
 
 
 ifeq ($(SOURCE_0),)
@@ -52,5 +56,5 @@
 	mkdir -p $(STAGING)
 
 # Final package location
-$(STAGING)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(STAGING) $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING)
+$(STAGING)/$(RELEASETARGET): $(STAGING) $(RELEASETARGET)
+	cp $(RELEASETARGET) $(STAGING)





More information about the commits mailing list