Hi Jens,

Fortunately, it should be perfectly valid to build part of the source with
g++3.4, and part with g++4.0...

Attached is a patch that works fine in tests on i386, using g++-3.4 to build
only those source files that cause ICEs with g++-4.0.  I don't know if
dll.cpp is the only problematic file, though -- this should be tested on one
of the hppa porter machines before uploading.

Cheers,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
[EMAIL PROTECTED]                                   http://www.debian.org/
diff -u libcrypto++-5.2.1c2/debian/rules libcrypto++-5.2.1c2/debian/rules
--- libcrypto++-5.2.1c2/debian/rules
+++ libcrypto++-5.2.1c2/debian/rules
@@ -39,11 +39,6 @@
 # GCC4 ICEs on some arches
 GCC4_ICES_HERE := arm m68k hppa
 DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-ifneq (,$(filter $(DEB_HOST_ARCH_CPU),$(GCC4_ICES_HERE)))
-    export CC=gcc-3.4
-    export CPP=cpp-3.4
-    export CXX=g++-3.4
-endif
 
 autotools_input := configure.ac Makefile.am config.h.in
 
@@ -66,6 +66,9 @@
 # Build and run the test suite
 build: config-stamp build-stamp
 build-stamp: patch-stamp
+ifneq (,$(filter $(DEB_HOST_ARCH_CPU),$(GCC4_ICES_HERE)))
+       CXX=g++-3.4 $(MAKE) dll.lo
+endif
        $(MAKE)
        ./cryptestcwd v
        touch $@
diff -u libcrypto++-5.2.1c2/debian/changelog 
libcrypto++-5.2.1c2/debian/changelog
--- libcrypto++-5.2.1c2/debian/changelog
+++ libcrypto++-5.2.1c2/debian/changelog
@@ -1,3 +1,10 @@
+libcrypto++ (5.2.1c2-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Use gcc3.4 for building *only* those source files which fail...
+
+ -- Steve Langasek <[EMAIL PROTECTED]>  Sat, 24 Sep 2005 04:18:14 -0700
+
 libcrypto++ (5.2.1c2-6) unstable; urgency=low
 
   * Circumvent GCC4 internal compiler error on m68k, arm, and hppa by

Attachment: signature.asc
Description: Digital signature

Reply via email to