diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2008-06-03 14:19:33 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2008-06-03 14:19:33 +0000 |
| commit | 2eb6139d252624cf25361775ba5312cb22fbdc8a (patch) | |
| tree | 825aad27464573bae9380d5af00b69f3aecfecb7 /games-action/openastromenace | |
| parent | amd64 stable, bug 224305 (diff) | |
| download | gentoo-2-2eb6139d252624cf25361775ba5312cb22fbdc8a.tar.gz gentoo-2-2eb6139d252624cf25361775ba5312cb22fbdc8a.tar.bz2 gentoo-2-2eb6139d252624cf25361775ba5312cb22fbdc8a.zip | |
Fix build error with cmake-2.6
(Portage version: 2.2_pre7-r1/cvs/Linux 2.6.25.4 Intel(R) Core(TM)2 Duo CPU E6750 @ 2.66GHz)
Diffstat (limited to 'games-action/openastromenace')
| -rw-r--r-- | games-action/openastromenace/ChangeLog | 6 | ||||
| -rw-r--r-- | games-action/openastromenace/files/openastromenace-1.2.0-cmake.patch | 26 | ||||
| -rw-r--r-- | games-action/openastromenace/openastromenace-1.2.0.ebuild | 8 |
3 files changed, 38 insertions, 2 deletions
diff --git a/games-action/openastromenace/ChangeLog b/games-action/openastromenace/ChangeLog index 0cc740922cda..54d9c8ad1b67 100644 --- a/games-action/openastromenace/ChangeLog +++ b/games-action/openastromenace/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-action/openastromenace # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/openastromenace/ChangeLog,v 1.1 2008/05/08 14:15:03 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/openastromenace/ChangeLog,v 1.2 2008/06/03 14:19:32 nyhm Exp $ + + 03 Jun 2008; Tristan Heaven <nyhm@gentoo.org> + +files/openastromenace-1.2.0-cmake.patch, openastromenace-1.2.0.ebuild: + Fix build error with cmake-2.6 *openastromenace-1.2.0 (08 May 2008) diff --git a/games-action/openastromenace/files/openastromenace-1.2.0-cmake.patch b/games-action/openastromenace/files/openastromenace-1.2.0-cmake.patch new file mode 100644 index 000000000000..17e194704d7e --- /dev/null +++ b/games-action/openastromenace/files/openastromenace-1.2.0-cmake.patch @@ -0,0 +1,26 @@ +--- CMakeLists.txt 2008/02/15 09:55:15 33 ++++ CMakeLists.txt 2008/05/19 08:11:36 36 +@@ -13,6 +13,8 @@ + # ./AstroMenace + # + ++CMAKE_MINIMUM_REQUIRED(VERSION 2.4) ++ + # project name + PROJECT(AstroMenace) + +@@ -43,9 +45,12 @@ + IF(DEFINED DATADIR) + ADD_DEFINITIONS(-DDATADIR=\\"${DATADIR}\\") + ENDIF(DEFINED DATADIR) +- ADD_DEFINITIONS(`${SDL_CONFIG} --cflags` -Wall) ++ EXEC_PROGRAM(${SDL_CONFIG} ARGS "--cflags" OUTPUT_VARIABLE SDL_CFLAGS) ++ EXEC_PROGRAM(${SDL_CONFIG} ARGS "--libs" OUTPUT_VARIABLE SDL_LIBS) ++ ++ ADD_DEFINITIONS(${SDL_CFLAGS}) + ADD_EXECUTABLE(AstroMenace ${astromenace_SRCS}) +- TARGET_LINK_LIBRARIES(AstroMenace `${SDL_CONFIG} --libs` ${OPENGL_gl_LIBRARY} ${OPENAL_LIBRARY} ${JPEG_LIBRARY} ${GLU_LIBRARY} -lalut -lvorbis -lvorbisfile) ++ TARGET_LINK_LIBRARIES(AstroMenace ${SDL_LIBS} ${OPENGL_gl_LIBRARY} ${OPENAL_LIBRARY} ${JPEG_LIBRARY} ${GLU_LIBRARY} -lalut -lvorbis -lvorbisfile) + IF(CYGWIN) + TARGET_LINK_LIBRARIES(AstroMenace -lGL.dll -lGLU.dll -lglfw -lX11.dll) + # ADD_DEFINITIONS(-mno-cygwin) diff --git a/games-action/openastromenace/openastromenace-1.2.0.ebuild b/games-action/openastromenace/openastromenace-1.2.0.ebuild index 4d7c9d97c673..fb8842f53792 100644 --- a/games-action/openastromenace/openastromenace-1.2.0.ebuild +++ b/games-action/openastromenace/openastromenace-1.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/openastromenace/openastromenace-1.2.0.ebuild,v 1.1 2008/05/08 14:15:03 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/openastromenace/openastromenace-1.2.0.ebuild,v 1.2 2008/06/03 14:19:32 nyhm Exp $ inherit eutils games @@ -31,6 +31,12 @@ DEPEND="${RDEPEND} S=${WORKDIR}/OpenAstroMenaceSVN +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-cmake.patch +} + src_compile() { cmake -DDATADIR="${GAMES_DATADIR}"/${PN} . || die "cmake failed" emake || die "emake failed" |