Lubuntu/cmake
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Build with g++-4.4 on hppa."

Browse Source 
This reverts commit c8c01e62b6fc6df64d237cb4f0905af7f635035d.

Conflicts:

	debian/changelog
This commit is contained in:
Modestas Vainius 2009-11-24 11:12:07 +02:00
parent 35ca1848e4
commit ec4053983e
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -2,6 +2,8 @@ cmake (2.8.0-4) UNRELEASED; urgency=low
* Update bootstraptest_increase_timeout.diff with upstream version. My previous * Update bootstraptest_increase_timeout.diff with upstream version. My previous
patch didn't work. 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 <modestas@vainius.eu> Mon, 23 Nov 2009 19:44:53 +0200 -- Modestas Vainius <modestas@vainius.eu> Mon, 23 Nov 2009 19:44:53 +0200

2
debian/control vendored
View File

@ -5,7 +5,7 @@ Maintainer: Modestas Vainius <modestas@vainius.eu>
Uploaders: A. Maitland Bottoms <bottoms@debian.org> Uploaders: A. Maitland Bottoms <bottoms@debian.org>
DM-Upload-Allowed: yes DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7.3), libcurl4-gnutls-dev, libxmlrpc-c3-dev, libexpat1-dev, zlib1g-dev, 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 Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/collab-maint/cmake.git Vcs-Git: git://git.debian.org/git/collab-maint/cmake.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/cmake.git;a=summary Vcs-Browser: http://git.debian.org/?p=collab-maint/cmake.git;a=summary

6
debian/rules vendored
View File

@ -7,12 +7,6 @@ ifeq ($(shell arch),parisc64)
CFLAGS += -ffunction-sections CFLAGS += -ffunction-sections
endif 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): $(BUILD_FLAGS_FILE):
touch $@ touch $@
echo 'set(CMAKE_SKIP_RPATH YES CACHE BOOL "Skip rpath" FORCE)' >> $@ echo 'set(CMAKE_SKIP_RPATH YES CACHE BOOL "Skip rpath" FORCE)' >> $@