[Python-modules-commits] r5830 - in packages/python-qt4/trunk/debian (changelog rules)

[shlomme at users.alioth.debian.org]

    Date: Thursday, July 3, 2008 @ 20:48:16
  Author: shlomme
Revision: 5830

* prepare another upload

Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/rules

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2008-07-03 20:34:31 UTC (rev 5829)
+++ packages/python-qt4/trunk/debian/changelog	2008-07-03 20:48:16 UTC (rev 5830)
@@ -1,3 +1,14 @@
+python-qt4 (4.4.2-4) unstable; urgency=medium
+
+  * urgency=medium to speed up migration to testing
+  * debian/control
+    - build with -Wl,--no-relax on alpha
+    - link with -Wl,-O1 to speed up dynamic loading
+    - build with -Os, decreases size of so's by about 10% 
+    - don't overwrite CXXFLAGS
+	
+ -- Torsten Marek <shlomme at debian.org>  Thu, 03 Jul 2008 22:45:26 +0200
+
 python-qt4 (4.4.2-3) unstable; urgency=medium
 
   * urgency=medium to speed up QScintilla2 migration to testing

Modified: packages/python-qt4/trunk/debian/rules
===================================================================
--- packages/python-qt4/trunk/debian/rules	2008-07-03 20:34:31 UTC (rev 5829)
+++ packages/python-qt4/trunk/debian/rules	2008-07-03 20:48:16 UTC (rev 5830)
@@ -8,17 +8,21 @@
 
 export QMAKESPEC=linux-g++
 
-CXXFLAGS=
-
 GCCVER := $(shell gcc -dumpversion | sed -e 's/.[0-9]$$//')
 
+LDFLAGS += -Wl,-O1
+
+ifeq ($(DEB_BUILD_ARCH),alpha)
+	LDFLAGS += -Wl,--no-relax
+endif
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CXXFLAGS += -O0
 else
 ifneq (,$(filter $(GCCVER),4.2))
 	CXXFLAGS += -O1
 else
-	CXXFLAGS += -O2
+	CXXFLAGS += -Os
 endif
 endif
 
@@ -26,7 +30,6 @@
 
 DEFAULT_PYTHON := $(shell pyversions -vd)
 
-
 ifneq (,$(filter $(GCCVER),4.2))
 	SPLIT=40
 else	
@@ -49,7 +52,7 @@
                         -j $(SPLIT) -m /usr/lib/python$*/config \
                         $(if $(filter $(DEFAULT_PYTHON),$*),,--disable-designer-plugin) \
                         LIBDIR_QT=/usr/lib LIBS_X11="" LIBS_THREAD="" \
-                        LFLAGS="" CXXFLAGS_RELEASE="${CXXFLAGS}" STRIP="" MOC=moc-qt4
+                        LFLAGS="" CXXFLAGS_RELEASE="${CXXFLAGS}" STRIP="" MOC=moc-qt4 LFLAGS_RELEASE="${LDFLAGS}"
 	touch $@
 
 dbg-build-%/configure-stamp: patch-stamp
@@ -62,7 +65,7 @@
                         -m /usr/lib/python$*/config_d \
                         $(if $(filter $(DEFAULT_PYTHON),$*),,--disable-designer-plugin) \
                         LIBDIR_QT=/usr/lib LIBS_X11="" LIBS_THREAD="" \
-                        LFLAGS="" CXXFLAGS_RELEASE="-O0 -g" STRIP="" MOC=moc-qt4
+                        LFLAGS="" CXXFLAGS_RELEASE="${CXXFLAGS}" STRIP="" MOC=moc-qt4 LFLAGS_RELEASE="${LDFLAGS}"
 	touch $@
 
 build: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)