From ec4053983e6ec16c8c4eee67f121396581934874 Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Tue, 24 Nov 2009 11:12:07 +0200 Subject: [PATCH] Revert "Build with g++-4.4 on hppa." This reverts commit c8c01e62b6fc6df64d237cb4f0905af7f635035d. Conflicts: debian/changelog --- debian/changelog | 2 ++ debian/control | 2 +- debian/rules | 6 ------ 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index ebf82b005..ff1a4b82d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ cmake (2.8.0-4) UNRELEASED; urgency=low * Update bootstraptest_increase_timeout.diff with upstream version. My previous patch didn't work. + * Revert previous "Build with g++-4.4 on hppa" change. It was not needed, build + with default compiler on hppa. -- Modestas Vainius Mon, 23 Nov 2009 19:44:53 +0200 diff --git a/debian/control b/debian/control index 1974536e8..40d853453 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), g++-4.4 [hppa] + libncurses5-dev, libqt4-dev (>= 4.4.0) 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 215ef4d82..fbe1f77b2 100755 --- a/debian/rules +++ b/debian/rules @@ -7,12 +7,6 @@ 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)' >> $@