diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-09-29 20:21:46 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-09-29 20:21:46 +0000 |
| commit | 1cb1abf5d33575358e916afe7ccce5954c8739a9 (patch) | |
| tree | ff0c204de9c3e511732790357d68637e9812337f /games-arcade | |
| parent | media-gfx/gimp: Remove vulnerable 2.6.12-r{2,4} (diff) | |
| download | gentoo-2-1cb1abf5d33575358e916afe7ccce5954c8739a9.tar.gz gentoo-2-1cb1abf5d33575358e916afe7ccce5954c8739a9.tar.bz2 gentoo-2-1cb1abf5d33575358e916afe7ccce5954c8739a9.zip | |
fix compilation for --as-needed
(Portage version: 2.2.0_alpha134/cvs/Linux x86_64)
Diffstat (limited to 'games-arcade')
| -rw-r--r-- | games-arcade/opensonic/ChangeLog | 6 | ||||
| -rw-r--r-- | games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/games-arcade/opensonic/ChangeLog b/games-arcade/opensonic/ChangeLog index b7c08f6edc73..42b47cd249c8 100644 --- a/games-arcade/opensonic/ChangeLog +++ b/games-arcade/opensonic/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/opensonic # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/opensonic/ChangeLog,v 1.5 2012/06/02 15:49:24 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/opensonic/ChangeLog,v 1.6 2012/09/29 20:21:46 hasufell Exp $ + + 29 Sep 2012; Julian Ospald <hasufell@gentoo.org> + files/opensonic-0.1.4-r1-cmake.patch: + fix compilation for --as-needed 02 Jun 2012; Julian Ospald <hasufell@gentoo.org> opensonic-0.1.4-r1.ebuild: bump to EAPI=4 diff --git a/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch b/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch index 684685100d86..b4db7644bc9d 100644 --- a/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch +++ b/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch @@ -6,6 +6,7 @@ use allegro-config remove "-O2" from pre-defined CFLAGS make paths modifiable add rules for icon, desktop-file and game-wrapper +fix compilation for as-needed --- CMakeLists.txt +++ CMakeLists.txt @@ -39,16 +40,19 @@ add rules for icon, desktop-file and game-wrapper IF(NOT ALLEGRO_UNIX_VERSION STREQUAL ALLEGRO_RECOMMENDED_VERSION) MESSAGE("\nWARNING: your Allegro version is ${ALLEGRO_UNIX_VERSION}. The recommended version is ${ALLEGRO_RECOMMENDED_VERSION}.\n ${GAME_NAME} may not compile properly!.\n") ENDIF(NOT ALLEGRO_UNIX_VERSION STREQUAL ALLEGRO_RECOMMENDED_VERSION) -@@ -251,7 +250,7 @@ +@@ -249,9 +248,8 @@ + IF(UNIX) + SET(GAME_SRCS ${GAME_SRCS} src/misc/iconlin.c) ADD_EXECUTABLE(${GAME_UNIXNAME} ${GAME_SRCS}) - SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES LINK_FLAGS ${ALLEGRO_UNIX_LIBS}) - TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m logg vorbisfile vorbis ogg jpgalleg z png loadpng) +- SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES LINK_FLAGS ${ALLEGRO_UNIX_LIBS}) +- TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m logg vorbisfile vorbis ogg jpgalleg z png loadpng) - SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "-Wall -O2 ${CFLAGS} ${CFLAGS_EXTRA}") ++ TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m logg vorbisfile vorbis ogg jpgalleg z png loadpng ${ALLEGRO_UNIX_LIBS}) + SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "-Wall") ENDIF(UNIX) -@@ -407,19 +406,43 @@ +@@ -407,19 +405,43 @@ SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES PROJECT_NAME "${GAME_NAME}") |