found 334999 0.23-3
tag 334999 patch
thanks

Sorry, but you made a little mistake again. While your code in
debian/rules is mostly correct it misses the fact that
DEB_HOST_ARCH is no predefined variable, you have to set it yourself.
So please add something like
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)

Also your build-dependency on g++ isn't necessary, g++ is
build-essential. Just adding the build-dependency for g++-3.4 on
the mentioned architectures is enough.

Attached is an alternate patch for debian/rules that is a little more
elegant. It's a modified version of the one suggested in
http://lists.debian.org/debian-devel/2005/09/msg00020.html
Just adding the line suggested above would suffice though, you don't
have to use the patch.

Gruesse,
-- 
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/
diff -Naur monotone_0.23-3/debian/control monotone-0.23/debian/control
--- monotone_0.23-3/debian/control      2005-10-23 14:54:28.000000000 +0200
+++ monotone-0.23/debian/control        2005-10-23 15:03:51.000000000 +0200
@@ -5,7 +5,7 @@
 Build-Depends: cdbs (>= 0.4.28), debhelper (>= 4.0.0), autotools-dev,
  libboost-date-time-dev, libboost-filesystem-dev, libboost-regex-dev,
  libboost-test-dev, libboost-dev, texinfo, libz-dev,
- g++ [!arm !hppa !m68k], g++-3.4 [arm hppa m68k]
+ g++-3.4 [arm hppa m68k]
 Standards-Version: 3.6.2
 
 Package: monotone
diff -Naur monotone_0.23-3/debian/rules monotone-0.23/debian/rules
--- monotone_0.23-3/debian/rules        2005-10-23 14:54:28.000000000 +0200
+++ monotone-0.23/debian/rules  2005-10-23 15:03:42.000000000 +0200
@@ -5,12 +5,9 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 #include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-ifeq ($DEB_HOST_ARCH,arm)
-DEB_CONFIGURE_EXTRA_FLAGS = CC=gcc-3.4 CXX=g++-3.4
-endif
-ifeq ($DEB_HOST_ARCH,hppa)
-DEB_CONFIGURE_EXTRA_FLAGS = CC=gcc-3.4 CXX=g++-3.4
-endif
-ifeq ($DEB_HOST_ARCH,m68k)
-DEB_CONFIGURE_EXTRA_FLAGS = CC=gcc-3.4 CXX=g++-3.4
+GCC4_ICES_HERE := arm m68k hppa
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+ifneq (,$(filter $(DEB_HOST_ARCH),$(GCC4_ICES_HERE)))
+       DEB_CONFIGURE_EXTRA_FLAGS = CC=gcc-3.4 CXX=g++-3.4
 endif

Reply via email to