Merge lp:~peter-pearse/ubuntu/natty/postgresql-8.4/prop001 into lp:ubuntu/natty/postgresql-8.4

[Peter Pearse]

Unmerged revisions

16. By Peter Pearse on 2011-04-07

Use multiarch paths when cross building.

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-05 20:41:08 +0000
+++ debian/changelog	2011-04-07 14:00:23 +0000
@@ -1,3 +1,9 @@
+postgresql-8.4 (8.4.5-1-ubuntu1) natty; urgency=low
+
+  * Use multiarch paths when cross building
+
+ -- Peter Pearse <[e-mail]>  Thu, 07 Apr 2011 12:51:58 +0000
+
 postgresql-8.4 (8.4.5-1) unstable; urgency=medium
 
   * Urgency medium, since this fixes a security bug (but also a lot of other

=== modified file 'debian/rules'
--- debian/rules	2010-07-19 23:29:03 +0000
+++ debian/rules	2011-04-07 14:00:23 +0000
@@ -9,6 +9,10 @@
 LDFLAGS+= -Wl,--as-needed
 CFLAGS+= -fPIC
 
+ifeq (yes,$(cdbs_crossbuild))
+        LDFLAGS += -L/usr/$(DEB_HOST_GNU_TYPE)/lib -L/usr/$(DEB_HOST_GNU_TYPE)/lib/mit-krb5
+endif
+
 ifneq ($(findstring $(DEB_BUILD_ARCH), sparc alpha),)
 # sparc and alpha's gcc currently miscompiles; see
 # http://lists.debian.org/debian-alpha/2007/11/msg00025.html
@@ -53,6 +57,26 @@
   CFLAGS='$(CFLAGS)' \
   LDFLAGS='$(LDFLAGS)'
 
+ifeq (,$(cdbs_crossbuild))
+        DEB_CONFIGURE_EXTRA_FLAGS +=		\
+  --with-tclconfig=/usr/lib/tcl$(TCL_VER)	\
+  --with-tkconfig=/usr/lib/tk$(TCL_VER)		\
+  --with-includes=/usr/include/tcl$(TCL_VER)	\
+  --with-system-tzdata=/usr/share/zoneinfo
+
+else
+        # Note we use the host zoneinfo
+        DEB_CONFIGURE_EXTRA_FLAGS += 		\
+  --with-tclconfig=/usr/$(DEB_HOST_GNU_TYPE)/lib/tcl$(TCL_VER)       \
+  --with-tkconfig=/usr/$(DEB_HOST_GNU_TYPE)/lib/tk$(TCL_VER)         \
+  --with-includes=/usr/$(DEB_HOST_GNU_TYPE)/include/tcl$(TCL_VER)    \
+  --with-system-tzdata=/usr/share/zoneinfo      
+
+  LDFLAGS += -L/usr/$(DEB_HOST_GNU_TYPE)/lib PMP003
+endif
+
+
+
 DEB_DH_MAKESHLIBS_ARGS := -Xusr/lib/postgresql/$(MAJOR_VER)
 # disabled for CVS builds
 #DEB_DH_INSTALLCHANGELOGS_ARGS := HISTORY