1 |
araujo 12/04/29 16:48:48 |
2 |
|
3 |
Added: io-2011.09.12-gentoo-fixes.patch |
4 |
Log: |
5 |
Update version. Fix bug #243876 , bug #339458 , bug #372659 , bug #372665 , bug #409639 |
6 |
|
7 |
(Portage version: 2.1.10.57/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-lang/io/files/io-2011.09.12-gentoo-fixes.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/io/files/io-2011.09.12-gentoo-fixes.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/io/files/io-2011.09.12-gentoo-fixes.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: io-2011.09.12-gentoo-fixes.patch |
16 |
=================================================================== |
17 |
diff -Nurwp io-2011.09.12-orig/addons/CMakeLists.txt io-2011.09.12-chag/addons/CMakeLists.txt |
18 |
--- io-2011.09.12-orig/addons/CMakeLists.txt 2011-09-12 18:14:12.000000000 -0400 |
19 |
+++ io-2011.09.12-chag/addons/CMakeLists.txt 2012-04-29 08:16:56.000000000 -0400 |
20 |
@@ -52,71 +52,135 @@ add_subdirectory(BigNum) |
21 |
add_subdirectory(Bitly) |
22 |
add_subdirectory(Blowfish) |
23 |
add_subdirectory(Box) |
24 |
+if(ENABLE_CFFI) |
25 |
add_subdirectory(CFFI) |
26 |
+endif(ENABLE_CFFI) |
27 |
+if(ENABLE_CGI) |
28 |
add_subdirectory(CGI) |
29 |
+endif(ENABLE_CGI) |
30 |
#add_subdirectory(Cairo) # XXX: Broken on OSX: ld: library not found for -lpng12 |
31 |
+if(ENABLE_CLUTTER) |
32 |
add_subdirectory(Clutter) |
33 |
+endif(ENABLE_CLUTTER) |
34 |
add_subdirectory(ContinuedFraction) |
35 |
+if(ENABLE_CURSES) |
36 |
add_subdirectory(Curses) |
37 |
+endif(ENABLE_CURSES) |
38 |
+if(ENABLE_DBI) |
39 |
add_subdirectory(DBI) |
40 |
+endif(ENABLE_DBI) |
41 |
add_subdirectory(DistributedObjects) |
42 |
+if(ENABLE_EDITLINE) |
43 |
add_subdirectory(EditLine) |
44 |
+endif(ENABLE_EDITLINE) |
45 |
add_subdirectory(Facebook) |
46 |
+if(ENABLE_FLUX) |
47 |
add_subdirectory(Flux) |
48 |
+endif(ENABLE_FLUX) |
49 |
add_subdirectory(Fnmatch) |
50 |
+if(ENABLE_FONT) |
51 |
add_subdirectory(Font) |
52 |
+endif(ENABLE_FONT) |
53 |
add_subdirectory(GLFW) # XXX: Can't meet dependencies |
54 |
+if(ENABLE_GOOGLESEARCH) |
55 |
add_subdirectory(GoogleSearch) |
56 |
+endif(ENABLE_GOOGLESEARCH) |
57 |
+if(ENABLE_HTTPCLIENT) |
58 |
add_subdirectory(HttpClient) |
59 |
+endif(ENABLE_HTTPCLIENT) |
60 |
+if(ENABLE_IMAGE) |
61 |
add_subdirectory(Image) |
62 |
+endif(ENABLE_IMAGE) |
63 |
+if(ENABLE_LZO) |
64 |
add_subdirectory(LZO) |
65 |
+endif(ENABLE_LZO) |
66 |
+if(ENABLE_LIBSNDFILE) |
67 |
add_subdirectory(LibSndFile) |
68 |
+endif(ENABLE_LIBSNDFILE) |
69 |
+if(ENABLE_LIBXML2) |
70 |
add_subdirectory(Libxml2) |
71 |
+endif(ENABLE_LIBXML2) |
72 |
add_subdirectory(Loki) |
73 |
+if(ENABLE_LOUDMOUTH) |
74 |
add_subdirectory(Loudmouth) |
75 |
+endif(ENABLE_LOUDMOUTH) |
76 |
+if(ENABLE_MD5SUM) |
77 |
add_subdirectory(MD5) |
78 |
+endif(ENABLE_MD5SUM) |
79 |
add_subdirectory(Memcached) |
80 |
+if(ENABLE_MYSQL) |
81 |
add_subdirectory(MySQL) |
82 |
+endif(ENABLE_MYSQL) |
83 |
#add_subdirectory(NetworkAdapter) |
84 |
add_subdirectory(NotificationCenter) |
85 |
#add_subdirectory(Oauth) # OAuth should no longer break CMake configuration on Windows now. |
86 |
#add_subdirectory(ODE) # XXX: Can't meet dependencies |
87 |
add_subdirectory(ObjcBridge) # XXX: Broken for me -- Objective-C 2.0 not supported |
88 |
add_subdirectory(Obsidian) |
89 |
+if(ENABLE_OGG) |
90 |
add_subdirectory(Ogg) |
91 |
+endif(ENABLE_OGG) |
92 |
+if(ENABLE_OPENGL) |
93 |
add_subdirectory(OpenGL) |
94 |
+endif(ENABLE_OPENGL) |
95 |
#add_subdirectory(PortAudio) # XXX: Dependency broken for me |
96 |
+if(ENABLE_POSTGRESQL) |
97 |
add_subdirectory(PostgreSQL) |
98 |
+endif(ENABLE_POSTGRESQL) |
99 |
#add_subdirectory(Postgres) |
100 |
+if(ENABLE_PYTHON) |
101 |
add_subdirectory(Python) |
102 |
+endif(ENABLE_PYTHON) |
103 |
add_subdirectory(QDBM) |
104 |
add_subdirectory(Random) |
105 |
add_subdirectory(Range) |
106 |
add_subdirectory(Rational) |
107 |
+if(ENABLE_READLINE) |
108 |
add_subdirectory(ReadLine) |
109 |
+endif(ENABLE_READLINE) |
110 |
+if(ENABLE_REGEX) |
111 |
add_subdirectory(Regex) |
112 |
+endif(ENABLE_REGEX) |
113 |
add_subdirectory(SGML) |
114 |
+if(ENABLE_SHA1) |
115 |
add_subdirectory(SHA1) |
116 |
+endif(ENABLE_SHA1) |
117 |
#add_subdirectory(SQLite) # XXX: Want to delete in favour of SQLite3 |
118 |
+if(ENABLE_SQLITE3) |
119 |
add_subdirectory(SQLite3) |
120 |
+endif(ENABLE_SQLITE3) |
121 |
#add_subdirectory(SampleRateConverter) |
122 |
add_subdirectory(SecureSocket) |
123 |
#add_subdirectory(SkipDB) # XXX: Disabled...why? |
124 |
+if(ENABLE_SOCKET) |
125 |
add_subdirectory(Socket) |
126 |
+endif(ENABLE_SOCKET) |
127 |
#add_subdirectory(SoundTouch) # XXX: I can't meet dependencies |
128 |
add_subdirectory(SqlDatabase) |
129 |
+if(ENABLE_SYSLOG) |
130 |
add_subdirectory(Syslog) |
131 |
+endif(ENABLE_SYSLOG) |
132 |
add_subdirectory(SystemCall) |
133 |
#add_subdirectory(TagDB) # XXX: I can't meet dependencies |
134 |
#add_subdirectory(TagLib) |
135 |
+if(ENABLE_THEORA) |
136 |
add_subdirectory(Theora) |
137 |
+endif(ENABLE_THEORA) |
138 |
+if(ENABLE_THREAD) |
139 |
add_subdirectory(Thread) |
140 |
+endif(ENABLE_THREAD) |
141 |
add_subdirectory(TokyoCabinet) |
142 |
+if(ENABLE_TWITTER) |
143 |
add_subdirectory(Twitter) |
144 |
+endif(ENABLE_TWITTER) |
145 |
add_subdirectory(UUID) |
146 |
add_subdirectory(User) |
147 |
add_subdirectory(VertexDB) |
148 |
add_subdirectory(Volcano) |
149 |
+if(ENABLE_VORBIS) |
150 |
add_subdirectory(Vorbis) |
151 |
+endif(ENABLE_VORBIS) |
152 |
add_subdirectory(Yajl) |
153 |
+if(ENABLE_ZLIB) |
154 |
add_subdirectory(Zlib) |
155 |
+endif(ENABLE_ZLIB) |
156 |
diff -Nurwp io-2011.09.12-orig/libs/basekit/CMakeLists.txt io-2011.09.12-chag/libs/basekit/CMakeLists.txt |
157 |
--- io-2011.09.12-orig/libs/basekit/CMakeLists.txt 2011-09-12 18:14:12.000000000 -0400 |
158 |
+++ io-2011.09.12-chag/libs/basekit/CMakeLists.txt 2012-04-21 22:06:47.000000000 -0400 |
159 |
@@ -24,3 +24,6 @@ add_library(basekit SHARED ${SRCS}) |
160 |
# The following add the install target, so we put libbasekit.* in our |
161 |
# install prefix. |
162 |
install(TARGETS basekit DESTINATION lib) |
163 |
+ |
164 |
+# Link basekit library against libdl (required by as-needed linking). |
165 |
+target_link_libraries(basekit dl) |
166 |
diff -Nurwp io-2011.09.12-orig/libs/coroutine/source/asm.S io-2011.09.12-chag/libs/coroutine/source/asm.S |
167 |
--- io-2011.09.12-orig/libs/coroutine/source/asm.S 2011-09-12 18:14:12.000000000 -0400 |
168 |
+++ io-2011.09.12-chag/libs/coroutine/source/asm.S 2012-04-21 23:20:26.000000000 -0400 |
169 |
@@ -258,3 +258,7 @@ SET: |
170 |
ldr r0, [r0] |
171 |
mov pc, lr |
172 |
#endif |
173 |
+ |
174 |
+#if defined(__linux__) && defined(__ELF__) |
175 |
+.section .note.GNU-stack,"",%progbits |
176 |
+#endif |