1 |
hasufell 12/11/23 17:15:51 |
2 |
|
3 |
Added: megaglest-3.7.1-as-needed.patch |
4 |
megaglest-3.7.1-static-build.patch |
5 |
Log: |
6 |
version bump |
7 |
|
8 |
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 games-strategy/megaglest/files/megaglest-3.7.1-as-needed.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/megaglest/files/megaglest-3.7.1-as-needed.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/megaglest/files/megaglest-3.7.1-as-needed.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: megaglest-3.7.1-as-needed.patch |
17 |
=================================================================== |
18 |
From: Julian Ospald <hasufell@g.o> |
19 |
Date: Fri Aug 31 23:45:34 UTC 2012 |
20 |
Subject: fix as-needed |
21 |
|
22 |
reorder linker line (curl after libircclient) |
23 |
|
24 |
--- source/shared_lib/CMakeLists.txt |
25 |
+++ source/shared_lib/CMakeLists.txt |
26 |
@@ -47,9 +47,7 @@ |
27 |
|
28 |
FIND_PACKAGE(CURL REQUIRED) |
29 |
INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) |
30 |
- IF(UNIX) |
31 |
- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CURL_LIBRARIES}) |
32 |
- ENDIF() |
33 |
+ |
34 |
# check libcurl version # |
35 |
IF(WIN32) |
36 |
file (READ ${PROJECT_SOURCE_DIR}${CURL_INCLUDE_DIR}/curl/curlver.h CURL_VERSION_H_CONTENTS) |
37 |
@@ -314,6 +312,10 @@ |
38 |
INCLUDE_DIRECTORIES(${IRCCLIENT_INCLUDE_DIR}) |
39 |
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${IRCCLIENT_LIBRARY}) |
40 |
|
41 |
+ IF(UNIX) |
42 |
+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CURL_LIBRARIES}) |
43 |
+ ENDIF() |
44 |
+ |
45 |
set(CMAKE_REQUIRED_INCLUDES "${IRCCLIENT_INCLUDE_DIR}") |
46 |
set(CMAKE_REQUIRED_LIBRARIES "${IRCCLIENT_LIBRARY}") |
47 |
include(CheckCXXSourceRuns) |
48 |
|
49 |
|
50 |
|
51 |
1.1 games-strategy/megaglest/files/megaglest-3.7.1-static-build.patch |
52 |
|
53 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/megaglest/files/megaglest-3.7.1-static-build.patch?rev=1.1&view=markup |
54 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/megaglest/files/megaglest-3.7.1-static-build.patch?rev=1.1&content-type=text/plain |
55 |
|
56 |
Index: megaglest-3.7.1-static-build.patch |
57 |
=================================================================== |
58 |
From: Julian Ospald <hasufell@g.o> |
59 |
Date: Sat Aug 18 13:41:33 UTC 2012 |
60 |
Subject: build system |
61 |
|
62 |
fix static build |
63 |
|
64 |
--- source/shared_lib/CMakeLists.txt |
65 |
+++ source/shared_lib/CMakeLists.txt |
66 |
@@ -273,21 +273,9 @@ |
67 |
streflop/softfloat) |
68 |
ENDIF() |
69 |
|
70 |
- IF(NOT WANT_STATIC_LIBS) |
71 |
- MESSAGE(STATUS "*** Searching for miniupnpc since WANT_STATIC_LIBS is off ...") |
72 |
- FIND_PACKAGE(Miniupnpc) |
73 |
- ENDIF() |
74 |
- |
75 |
- if(NOT MINIUPNP_FOUND) |
76 |
- MESSAGE(STATUS "*** Using EMBEDDED miniupnpc since dev system does not have it... MINIUPNP_FOUND [${MINIUPNP_FOUND}]") |
77 |
- |
78 |
- SET(DIRS_WITH_SRC ${DIRS_WITH_SRC} platform/miniupnpc) |
79 |
- else() |
80 |
- MESSAGE(STATUS "*** Using SHARED miniupnpc found in [${MINIUPNP_INCLUDE_DIR}] MINIUPNP_FOUND [${MINIUPNP_FOUND}] MINIUPNP_LIBRARY [${MINIUPNP_LIBRARY}]") |
81 |
- |
82 |
- INCLUDE_DIRECTORIES(${MINIUPNP_INCLUDE_DIR}) |
83 |
- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${MINIUPNP_LIBRARY}) |
84 |
- endif() |
85 |
+ FIND_PACKAGE(Miniupnpc REQUIRED) |
86 |
+ INCLUDE_DIRECTORIES(${MINIUPNP_INCLUDE_DIR}) |
87 |
+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${MINIUPNP_LIBRARY}) |
88 |
|
89 |
IF(MINIUPNPC_VERSION_PRE1_5) |
90 |
ADD_DEFINITIONS(-DMINIUPNPC_VERSION_PRE1_5) |
91 |
@@ -322,22 +310,9 @@ |
92 |
INCLUDE_DIRECTORIES( ${MG_INCLUDES_ROOT}platform/sdl ) |
93 |
INCLUDE_DIRECTORIES( ${MG_INCLUDES_ROOT}xml/rapidxml ) |
94 |
|
95 |
- IF(NOT WANT_STATIC_LIBS) |
96 |
- MESSAGE(STATUS "*** Searching for libircclient since WANT_STATIC_LIBS is off ...") |
97 |
- FIND_PACKAGE(Ircclient) |
98 |
- ENDIF() |
99 |
- |
100 |
- if(NOT IRCCLIENT_FOUND) |
101 |
- MESSAGE(STATUS "*** Using EMBEDDED libircclient since this system does not have it... IRCCLIENT_FOUND [${IRCCLIENT_FOUND}]") |
102 |
- |
103 |
- SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${PROJECT_SOURCE_DIR}/source/shared_lib/sources/libircclient/src/libircclient.c) |
104 |
- INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/shared_lib/include/libircclient/include) |
105 |
- else() |
106 |
- MESSAGE(STATUS "*** Using SHARED libircclient found in [${IRCCLIENT_INCLUDE_DIR}] IRCCLIENT_FOUND [${IRCCLIENT_FOUND}] IRCCLIENT_LIBRARY [${IRCCLIENT_LIBRARY}]") |
107 |
- |
108 |
- INCLUDE_DIRECTORIES(${IRCCLIENT_INCLUDE_DIR}) |
109 |
- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${IRCCLIENT_LIBRARY}) |
110 |
- endif() |
111 |
+ FIND_PACKAGE(Ircclient REQUIRED) |
112 |
+ INCLUDE_DIRECTORIES(${IRCCLIENT_INCLUDE_DIR}) |
113 |
+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${IRCCLIENT_LIBRARY}) |
114 |
|
115 |
set(CMAKE_REQUIRED_INCLUDES "${IRCCLIENT_INCLUDE_DIR}") |
116 |
set(CMAKE_REQUIRED_LIBRARIES "${IRCCLIENT_LIBRARY}") |
117 |
--- mk/cmake/Modules/FindMiniupnpc.cmake |
118 |
+++ mk/cmake/Modules/FindMiniupnpc.cmake |
119 |
@@ -35,7 +35,11 @@ |
120 |
|
121 |
find_path(MINIUPNP_INCLUDE_DIR miniupnpc.h |
122 |
PATH_SUFFIXES miniupnpc) |
123 |
-find_library(MINIUPNP_LIBRARY miniupnpc) |
124 |
+IF(WANT_STATIC_LIBS) |
125 |
+ find_library(MINIUPNP_LIBRARY libminiupnpc.a) |
126 |
+ELSE(WANT_STATIC_LIBS) |
127 |
+ find_library(MINIUPNP_LIBRARY libminiupnpc.so) |
128 |
+ENDIF(WANT_STATIC_LIBS) |
129 |
|
130 |
if (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY) |
131 |
set (MINIUPNP_FOUND TRUE) |
132 |
--- mk/cmake/Modules/FindOGG.cmake |
133 |
+++ mk/cmake/Modules/FindOGG.cmake |
134 |
@@ -19,12 +19,12 @@ |
135 |
|
136 |
FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h) |
137 |
|
138 |
-#IF (OGG_STATIC AND NOT OGG_LIBRARY) |
139 |
-# FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg) |
140 |
-#ELSE() |
141 |
- FIND_LIBRARY(OGG_LIBRARY NAMES ogg) |
142 |
-#ENDIF() |
143 |
- |
144 |
+IF (OGG_STATIC) |
145 |
+ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a) |
146 |
+ELSE() |
147 |
+ FIND_LIBRARY(OGG_LIBRARY NAMES libogg.so) |
148 |
+ENDIF() |
149 |
+ |
150 |
#IF (OGG_STATIC AND NOT VORBIS_LIBRARY) |
151 |
# FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis) |
152 |
#ELSE() |
153 |
--- mk/cmake/Modules/FindLUAJIT.cmake |
154 |
+++ mk/cmake/Modules/FindLUAJIT.cmake |
155 |
@@ -18,13 +18,13 @@ |
156 |
NAMES luajit.h |
157 |
PATH_SUFFIXES luajit-2.0) |
158 |
|
159 |
-if (LUAJIT_FIND_STATIC) |
160 |
+#if (LUAJIT_FIND_STATIC) |
161 |
find_library(LUAJIT_LIBRARIES luajit.a |
162 |
NAMES libluajit-5.1.a) |
163 |
-else (LUATJIT_FIND_STATIC) |
164 |
- find_library(LUAJIT_LIBRARIES luajit |
165 |
- NAMES luajit-5.1) |
166 |
-endif (LUAJIT_FIND_STATIC) |
167 |
+#else (LUATJIT_FIND_STATIC) |
168 |
+# find_library(LUAJIT_LIBRARIES luajit.so |
169 |
+# NAMES libluajit-5.1.so) |
170 |
+#endif (LUAJIT_FIND_STATIC) |
171 |
|
172 |
mark_as_advanced(LUAJIT_INCLUDE_DIR) |
173 |
mark_as_advanced(LUAJIT_LIBRARIES) |