[Pkg-sks-commit] r22 - in sks/trunk/sks/debian: . patches

[chrism at alioth.debian.org]

Author: chrism
Date: 2008-06-19 14:34:16 +0000 (Thu, 19 Jun 2008)
New Revision: 22

Modified:
   sks/trunk/sks/debian/TODO
   sks/trunk/sks/debian/patches/501_makefile_cflags
   sks/trunk/sks/debian/rules
Log:
[project @ 23]
more about CFLAGS

Original author: fabbione
Date: 2003-11-29 16:41:57.967559+00:00

Modified: sks/trunk/sks/debian/TODO
===================================================================
--- sks/trunk/sks/debian/TODO	2008-06-19 14:34:10 UTC (rev 21)
+++ sks/trunk/sks/debian/TODO	2008-06-19 14:34:16 UTC (rev 22)
@@ -8,6 +8,8 @@
 
 For the first upload:
 	- passing CFLAGS to cryptokit and numerix
+	  - we need to find an elegant solution. tho the bdb stuff is shipped
+	    both as tar.gz and unpacked..
 	- debian fhs needs to be completed
 	  - where are the recon and db sockets?  do they still exist in 1.0.5?
 	- completing Build-Depends:
@@ -20,6 +22,7 @@
 	- dedicated uid, chown all the dirs to that user
 	  - we need to go for a debconf question to and ask the admin to create
 	    a user and chwon everything in postint. A non login user should be ok.
+	    - discussion on debian-devel
 	- init script to start sks
 
 	upstream issues:

Modified: sks/trunk/sks/debian/patches/501_makefile_cflags
===================================================================
--- sks/trunk/sks/debian/patches/501_makefile_cflags	2008-06-19 14:34:10 UTC (rev 21)
+++ sks/trunk/sks/debian/patches/501_makefile_cflags	2008-06-19 14:34:16 UTC (rev 22)
@@ -1,6 +1,20 @@
+diff -ruN sks-old/bdb/Makefile sks/bdb/Makefile
+--- sks-old/bdb/Makefile	2003-07-05 17:16:29.000000000 +0200
++++ sks/bdb/Makefile	2003-11-29 17:33:19.000000000 +0100
+@@ -16,8 +16,8 @@
+ CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE)
+ CC=gcc
+ CXX=g++
+-CFLAGS=-O3 -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I .
+-CXXFLAGS=-O3 $(CINCLUDES) $(BDBLIB) -I .
++CFLAGS=$(DEBCFLAGS) -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I .
++CXXFLAGS=$(DEBCFLAGS) $(CINCLUDES) $(BDBLIB) -I .
+ 
+ MKLIB=ocamlmklib
+ RANLIB=ranlib
 diff -ruN sks-old/Makefile sks/Makefile
 --- sks-old/Makefile	2003-10-12 22:20:18.000000000 +0200
-+++ sks/Makefile	2003-11-28 22:56:28.000000000 +0100
++++ sks/Makefile	2003-11-29 17:34:11.000000000 +0100
 @@ -17,8 +17,8 @@
  CINCLUDES=-I`ocamlc -where`
  CC=gcc
@@ -12,3 +26,16 @@
  
  ifndef OCAMLC
  	OCAMLC=ocamlc
+@@ -226,10 +226,10 @@
+ ##################################
+ 
+ bdb/bdb.cmxa: bdb/bdb_stubs.c bdb/bdb_stubs.h
+-	cd bdb && $(MAKE) bdb.cmxa
++	cd bdb && $(MAKE) DEBCFLAGS="$(DEBCFLAGS)" bdb.cmxa
+ 
+ bdb/bdb.cma: bdb/bdb_stubs.c bdb/bdb_stubs.h
+-	cd bdb && $(MAKE) bdb.cma
++	cd bdb && $(MAKE) DEBCFLAGS="$(DEBCFLAGS)" bdb.cma
+ 
+ bdbclean:
+ 	cd bdb && $(MAKE) clean

Modified: sks/trunk/sks/debian/rules
===================================================================
--- sks/trunk/sks/debian/rules	2008-06-19 14:34:10 UTC (rev 21)
+++ sks/trunk/sks/debian/rules	2008-06-19 14:34:16 UTC (rev 22)
@@ -8,11 +8,11 @@
   include /usr/share/dbs/dpkg-arch.mk
 endif
 
-DEBFLAGS = -g
+DEBCFLAGS = -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	DEBFLAGS += -O0
+	DEBCFLAGS += -O0
 else
-	DEBFLAGS += -O3
+	DEBCFLAGS += -O3
 endif
 
 configure: configure-stamp
@@ -24,7 +24,7 @@
 build: configure-stamp build-stamp
 build-stamp: $(patched)
 	dh_testdir
-	cd $(BUILD_TREE) && $(MAKE) DEBCFLAGS="$(DEBFLAGS)" all
+	cd $(BUILD_TREE) && $(MAKE) DEBCFLAGS="$(DEBCFLAGS)" all
 	touch build-stamp
 
 install: build