[Pkg-kde-commits] rev 1312 - trunk/packages/qt-x11-free/debian

[Adeodato Simó]

Author: adeodato
Date: 2005-07-15 17:30:54 +0000 (Fri, 15 Jul 2005)
New Revision: 1312

Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/rules
Log:
use DEB_HOST_ARCH_CPU instead of DEB_BUILD_GNU_CPU to detect an i386 CPU.


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2005-07-15 07:40:33 UTC (rev 1311)
+++ trunk/packages/qt-x11-free/debian/changelog	2005-07-15 17:30:54 UTC (rev 1312)
@@ -37,6 +37,8 @@
 
   * Overhaul arch detection in debian/rules:
     - use DEB_HOST_ARCH instead of DEB_BUILD_GNU_CPU to detect arm.
+    - use DEB_HOST_ARCH_CPU instead of DEB_BUILD_GNU_CPU to detect an i386 CPU
+      (needs the new dpkg).
 
   +++ Changes by Christopher Martin:
 

Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules	2005-07-15 07:40:33 UTC (rev 1311)
+++ trunk/packages/qt-x11-free/debian/rules	2005-07-15 17:30:54 UTC (rev 1312)
@@ -11,8 +11,8 @@
 OLD_PATH := $(PATH)
 export PATH=$(QTDIR)/bin:$(OLD_PATH)
 
-DEB_BUILD_GNU_CPU   ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_HOST_ARCH    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH     ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 # dpatch stuff
 include /usr/share/dpatch/dpatch.make
@@ -84,14 +84,11 @@
 		# End of CONFIGURE_OPTS
 		# TODO: Styles as plugins?
 
-ifneq ($(DEB_BUILD_GNU_CPU),i386)
+ifneq ($(DEB_HOST_ARCH_CPU),i386)
 	CONFIGURE_OPTS += -no-sql-ibase
-endif
-
-ifeq ($(DEB_BUILD_GNU_CPU),i386)
-	IBASE =
-else
 	IBASE = -Nlibqt3c102-ibase -Nlibqt3c102-mt-ibase
+else
+	IBASE =
 endif
 
 ifeq ($(DEB_HOST_ARCH),arm)