[Pkg-corba-commits] r35 - in /trunk/omniorb4: debian/rules mk/beforeauto.mk.in

[flub-guest at users.alioth.debian.org]

Author: flub-guest
Date: Sun Oct 21 21:07:41 2007
New Revision: 35

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=35
Log:
* mk/beforeauto.mk.in, debian/rules: Honour the noopt DEB_BUILD_OPTIONS
  environment variable.  Set *DEBUGFLAGS to just -g in
  mk/beforeauto.mk.in and use 'g?? -O?' as compiler instead.
* debian/rules: Install the configuration file in the binary-arch
  target so that dh_installdirs has actually created the etc/ directory
  already.

Modified:
    trunk/omniorb4/debian/rules
    trunk/omniorb4/mk/beforeauto.mk.in

Modified: trunk/omniorb4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/rules?rev=35&op=diff
==============================================================================
--- trunk/omniorb4/debian/rules (original)
+++ trunk/omniorb4/debian/rules Sun Oct 21 21:07:41 2007
@@ -12,6 +12,15 @@
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
+# CFLAGS is not honoured by the omniORB build system.
+ifeq (noopt,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+  CC=gcc -O0
+  CXX=g++ -O0
+else
+  CC=gcc -O2
+  CXX=g++ -O2
+endif
+
 PRG_PACKAGES := omniorb4 omniorb4-nameserver omniidl4
 DEV_PACKAGES := libcos4-dev libomniorb4-dev libomnithread3-dev
 
@@ -20,7 +29,7 @@
 	cp -f /usr/share/misc/config.sub /usr/share/misc/config.guess bin/scripts
 	-mkdir build
 	cd build && \
-	../configure $(confflags) \
+	CC="$(CC)" CXX="$(CXX)" ../configure $(confflags) \
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
@@ -54,7 +63,6 @@
 	find $(CURDIR)/debian/tmp/usr/include/omniORB4/internal -type f ! -name orbOptions.h | xargs -r rm
 	-find debian/tmp -name "*.pyc" -exec rm {} \;
 	dh_install --sourcedir=debian/tmp
-	install -m 0644 sample.cfg debian/libomniorb4-1/etc/omniORB4.cfg
 	sed -i '1d' debian/omniidl4/usr/lib/python2.*/site-packages/omniidl/main.py
 
 # Build architecture-independent files here.
@@ -81,6 +89,7 @@
 	dh_testdir -a
 	dh_testroot -a
 	dh_installdirs -a
+	install -m 0644 sample.cfg debian/libomniorb4-1/etc/omniORB4.cfg
 	dh_installdocs -a
 	dh_installexamples -a
 	dh_installinit -a

Modified: trunk/omniorb4/mk/beforeauto.mk.in
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/mk/beforeauto.mk.in?rev=35&op=diff
==============================================================================
--- trunk/omniorb4/mk/beforeauto.mk.in (original)
+++ trunk/omniorb4/mk/beforeauto.mk.in Sun Oct 21 21:07:41 2007
@@ -711,10 +711,10 @@
 #
 # Default compiler rules
 #
-CDEBUGFLAGS     = -O2 -g
+CDEBUGFLAGS     = -g
 CLINK           = $(CC)
 CLINKOPTIONS    = $(CDEBUGFLAGS) $(COPTIONS)
-CXXDEBUGFLAGS   = -O2 -g
+CXXDEBUGFLAGS   = -g
 CXXLINK         = $(CXX)
 CXXLINKOPTIONS  = $(CXXDEBUGFLAGS) $(CXXOPTIONS)