diff --git a/debian/changelog b/debian/changelog index 92b59672e..70740a1c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ cmake (2.8.0-3) UNRELEASED; urgency=low * Increase timeout of BootstrapTest to 2 hours so it no longer times out on s390 or armel (patch bootstraptest_increase_timeout.diff). * Fix GNU.cmake file used on Hurd. Thanks to Pino Toscano for the patch. + * Build with g++-4.4 on hppa. May solve FTBFS (segfault likely due to + miscompilation) reported in #556653. -- Modestas Vainius Sun, 22 Nov 2009 20:05:59 +0200 diff --git a/debian/control b/debian/control index 40d853453..1974536e8 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Modestas Vainius Uploaders: A. Maitland Bottoms DM-Upload-Allowed: yes Build-Depends: debhelper (>= 7.3), libcurl4-gnutls-dev, libxmlrpc-c3-dev, libexpat1-dev, zlib1g-dev, - libncurses5-dev, libqt4-dev (>= 4.4.0) + libncurses5-dev, libqt4-dev (>= 4.4.0), g++-4.4 [hppa] Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/collab-maint/cmake.git Vcs-Browser: http://git.debian.org/?p=collab-maint/cmake.git;a=summary diff --git a/debian/rules b/debian/rules index fbe1f77b2..215ef4d82 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,12 @@ ifeq ($(shell arch),parisc64) CFLAGS += -ffunction-sections endif +# Build with gcc 4.4 on hppa +ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH),hppa) +export CC=gcc-4.4 +export CXX=g++-4.4 +endif + $(BUILD_FLAGS_FILE): touch $@ echo 'set(CMAKE_SKIP_RPATH YES CACHE BOOL "Skip rpath" FORCE)' >> $@