Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Krzysztof Pawlik (nelchael)" <nelchael@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/resin/4.0.26: mod_caucho-4.0.26-configure.patch mod_caucho-4.0.26-ldflags.patch resin-4.0.26-build.patch resin-4.0.26-classpath.patch resin-4.0.26-configure.patch resin-4.0.26-ldflags.patch
Date: Sun, 04 Mar 2012 11:10:45
Message-Id: 20120304111032.38D092004B@flycatcher.gentoo.org
1 nelchael 12/03/04 11:10:32
2
3 Added: mod_caucho-4.0.26-configure.patch
4 mod_caucho-4.0.26-ldflags.patch
5 resin-4.0.26-build.patch
6 resin-4.0.26-classpath.patch
7 resin-4.0.26-configure.patch
8 resin-4.0.26-ldflags.patch
9 Log:
10 Add patches for Resin 4.0.26.
11
12 Revision Changes Path
13 1.1 src/patchsets/resin/4.0.26/mod_caucho-4.0.26-configure.patch
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.26/mod_caucho-4.0.26-configure.patch?rev=1.1&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.26/mod_caucho-4.0.26-configure.patch?rev=1.1&content-type=text/plain
17
18 Index: mod_caucho-4.0.26-configure.patch
19 ===================================================================
20 --- resin-4.0.26.vanilla/configure.ac 2012-03-04 11:33:20.347437179 +0100
21 +++ resin-4.0.26/configure.ac 2012-03-04 11:46:18.913514661 +0100
22 @@ -783,16 +783,16 @@
23 linux*)
24 LD_SHLIB=${CC}
25
26 - CFLAGS="$CFLAGS -pthread -fPIC -fno-omit-frame-pointer -O2"
27 + CFLAGS="$CFLAGS -pthread -fPIC -fno-omit-frame-pointer"
28 CFLAGS_JNI="$CFLAGS_JNI -fPIC"
29 LDFLAGS_SHLIB="-shared -fPIC"
30
31 if test -n "$b64_jni"; then
32 - CFLAGS_JNI="$CFLAGS_JNI -m64 -fPIC"
33 - LDFLAGS_SHLIB="$LDFLAGS_SHLIB -m64"
34 + CFLAGS_JNI="$CFLAGS_JNI -fPIC"
35 + LDFLAGS_SHLIB="$LDFLAGS_SHLIB "
36 else
37 - CFLAGS_JNI="$CFLAGS_JNI -m32"
38 - LDFLAGS_SHLIB="$LDFLAGS_SHLIB -m32"
39 + CFLAGS_JNI="$CFLAGS_JNI "
40 + LDFLAGS_SHLIB="$LDFLAGS_SHLIB "
41 fi
42 ;;
43
44 @@ -805,12 +805,12 @@
45 CFLAGS_JNI="$CFLAGS_JNI -fPIC -fno-omit-frame-pointer"
46
47 if test -n "$b64"; then
48 - CFLAGS="$CFLAGS -m64"
49 - LDFLAGS_SHLIB="-m64 -R /usr/sfw/lib/64 -R /usr/local/lib/sparcv9"
50 + CFLAGS="$CFLAGS "
51 + LDFLAGS_SHLIB=" -R /usr/sfw/lib/64 -R /usr/local/lib/sparcv9"
52 fi
53 if test -n "${b64_jni}"; then
54 - CFLAGS_JNI="$CFLAGS_JNI -m64"
55 - LDFLAGS_SHLIB="-m64 -R /usr/sfw/lib/64 -R /usr/local/lib/sparcv9"
56 + CFLAGS_JNI="$CFLAGS_JNI "
57 + LDFLAGS_SHLIB=" -R /usr/sfw/lib/64 -R /usr/local/lib/sparcv9"
58 fi
59
60 LDFLAGS_SHLIB="$LDFLAGS_SHLIB -shared"
61 @@ -819,11 +819,11 @@
62 CFLAGS_SHLIB="-mt -KPIC -xO2"
63
64 if test -n "$b64"; then
65 - CFLAGS="$CFLAGS -m64"
66 + CFLAGS="$CFLAGS "
67 fi
68 if test -n "$b64_jni"; then
69 - CFLAGS_JNI="$CFLAGS_JNI -m64"
70 - LDFLAGS_SHLIB="$LDFLAGS_SHLIB -m64 -G -mt -z defs -z text"
71 + CFLAGS_JNI="$CFLAGS_JNI "
72 + LDFLAGS_SHLIB="$LDFLAGS_SHLIB -G -mt -z defs -z text"
73 LDFLAGS_SHLIB="$LDFLAGS_SHLIB -R/usr/lib/64:/usr/sfw/lib/64:/usr/local/lib/sparcv9 -YP,/usr/lib/64:/usr/sfw/lib/64:/usr/local/lib/sparcv9"
74 fi
75
76 @@ -840,7 +840,7 @@
77 LDFLAGS_SHLIB="-arch x86_64 $LDFLAGS_SHLIB"
78 fi
79 if test -n "$b64_jni"; then
80 - CFLAGS_JNI="$CFLAGS_JNI -m64"
81 + CFLAGS_JNI="$CFLAGS_JNI "
82 LDFLAGS_SHLIB="-arch x86_64 $LDFLAGS_SHLIB"
83 fi
84 ;;
85 @@ -871,8 +871,8 @@
86 # case "$target_cpu" in
87 # x86_64)
88 # if test -z "$b64_jni"; then
89 -# CFLAGS_JNI="$CFLAGS_JNI -m32"
90 -# LDFLAGS_SHLIB="$LDFLAGS_SHLIB -m32"
91 +# CFLAGS_JNI="$CFLAGS_JNI "
92 +# LDFLAGS_SHLIB="$LDFLAGS_SHLIB "
93 # fi
94 # ;;
95 # esac
96 @@ -1114,11 +1114,6 @@
97 echo "checking for JNI in $JAVA_HOME/include ... found"
98 else
99 JNI=""
100 - AC_MSG_ERROR([
101 -
102 - *** Can't find JNI directory in JAVA_HOME=${JAVA_HOME}
103 - *** JNI is expected in ${JAVA_HOME}/include/$jni_os
104 - ])
105 fi
106
107 HAS_JVMTI=""
108 @@ -1133,8 +1128,6 @@
109 echo "Using JVMTI for class reloading"
110
111 CFLAGS="$CFLAGS -DHAS_JVMTI"
112 - else
113 - AC_MSG_ERROR([Can't find JVMTI directory ${JNI_INCLUDE_DIR}/jvmti.h])
114 fi
115 fi
116
117
118
119
120 1.1 src/patchsets/resin/4.0.26/mod_caucho-4.0.26-ldflags.patch
121
122 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.26/mod_caucho-4.0.26-ldflags.patch?rev=1.1&view=markup
123 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.26/mod_caucho-4.0.26-ldflags.patch?rev=1.1&content-type=text/plain
124
125 Index: mod_caucho-4.0.26-ldflags.patch
126 ===================================================================
127 --- resin-4.0.26.vanilla/modules/c/src/apache2/Makefile.in 2012-03-04 11:33:18.455432143 +0100
128 +++ resin-4.0.26/modules/c/src/apache2/Makefile.in 2012-03-04 11:43:23.381046283 +0100
129 @@ -27,7 +27,7 @@
130 # mv mod_caucho.la mod_caucho.so
131
132 mod_caucho.la : $(OBJ_PICS)
133 - $(LIBTOOL) --mode=link $(LD_SHLIB) $(LDFLAGS_SHLIB) -module -o $@ -avoid-version -rpath $(apache_libexec) $(OBJ_PICS) $(LIBS_SHLIB)
134 + $(LIBTOOL) --mode=link $(LD_SHLIB) $(LDFLAGS) $(LDFLAGS_SHLIB) -module -o $@ -avoid-version -rpath $(apache_libexec) $(OBJ_PICS) $(LIBS_SHLIB)
135
136 .c.lo :
137 $(LIBTOOL) --mode=compile $(CC) -o $@ -c $(INCLUDES) $(CFLAGS) $<
138
139
140
141 1.1 src/patchsets/resin/4.0.26/resin-4.0.26-build.patch
142
143 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.26/resin-4.0.26-build.patch?rev=1.1&view=markup
144 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.26/resin-4.0.26-build.patch?rev=1.1&content-type=text/plain
145
146 Index: resin-4.0.26-build.patch
147 ===================================================================
148 diff -Nru resin-4.0.26.vanilla/build-common.xml resin-4.0.26/build-common.xml
149 --- resin-4.0.26.vanilla/build-common.xml 2012-03-04 11:33:20.339437166 +0100
150 +++ resin-4.0.26/build-common.xml 2012-03-04 11:56:30.178797946 +0100
151 @@ -37,15 +37,12 @@
152 <property name="resin.dist" location="${resindir}/dist"/>
153
154 <property name="javac.verbose" value="off"/>
155 - <property name="javac.debug" value="on"/>
156 - <property name="javac.optimize" value="off"/>
157 + <property name="javac.debug" value="off"/>
158 + <property name="javac.optimize" value="on"/>
159 <property name="javac.deprecation" value="off"/>
160 <property name="javac.nowarn" value="on"/>
161 <property name="javac.memoryMaximumSize" value="512m"/>
162
163 - <property name="javac.source" value="1.5"/>
164 - <property name="javac.target" value="1.5"/>
165 -
166 <property name="jar.compress" value="false"/>
167 <!--
168 <property name="jar.index" value="true"/>
169 @@ -212,6 +209,9 @@
170 <include name="**/*.jar"/>
171 <exclude name="ant-1.6.5.jar"/>
172 </fileset>
173 + <fileset dir="${basedir}/gentoo-deps">
174 + <include name="**/*.jar"/>
175 + </fileset>
176 </classpath>
177 </javac>
178
179 @@ -292,6 +292,9 @@
180 <fileset dir="${maven.lib}">
181 <include name="**/*.jar"/>
182 </fileset>
183 + <fileset dir="${basedir}/gentoo-deps">
184 + <include name="**/*.jar"/>
185 + </fileset>
186 </classpath>
187 </javac>
188
189 @@ -498,10 +501,6 @@
190
191 <property file="${artifact.src}/module.properties"/>
192
193 - <mkdir dir="${dist.build}/project-jars"/>
194 -
195 - <copy tofile="${dist.build}/project-jars/resin-${artifact.name}-${version}.jar"
196 - file="${artifact.dist}/${artifact.jar}"/>
197 </target>
198
199 <target name="resin.dist.jar"
200 diff -Nru resin-4.0.26.vanilla/build.xml resin-4.0.26/build.xml
201 --- resin-4.0.26.vanilla/build.xml 2012-03-04 11:33:20.339437166 +0100
202 +++ resin-4.0.26/build.xml 2012-03-04 11:56:30.178797946 +0100
203 @@ -12,7 +12,7 @@
204 <property name="eclipse.home" value="${user.home}/eclipse"/>
205
206 <target name="compile"
207 - depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, resin-eclipselink">
208 + depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus, resin, ecmascript, cdi, webutil, conf, j2ee-management">
209 </target>
210
211 <!--
212 @@ -156,7 +156,7 @@
213 </antcall>
214 </target>
215
216 - <target name="hessian" depends="init, servlet16">
217 + <target name="hessian" depends="init">
218 <antcall target="module" inheritRefs="true">
219 <param name="module.name" value="hessian"/>
220 <param name="module.jar" value="hessian.jar"/>
221 @@ -180,7 +180,7 @@
222 </antcall>
223 </target>
224
225 - <target name="jaxrpc" depends="init,saaj,servlet16">
226 + <target name="jaxrpc" depends="init,saaj">
227 <antcall target="module" inheritRefs="true">
228 <param name="module.name" value="jaxrpc"/>
229 <param name="module.jar" value="jaxrpc-15.jar"/>
230 @@ -228,13 +228,6 @@
231 </antcall>
232 </target>
233
234 - <target name="servlet16" depends="init">
235 - <antcall target="module" inheritRefs="true">
236 - <param name="module.name" value="servlet16"/>
237 - <param name="module.jar" value="servlet-16.jar"/>
238 - </antcall>
239 - </target>
240 -
241 <!--
242 We now ship Sun's jsf-api.jar and jsf-impl.jar in modules/ext/
243 <target name="jsf" depends="init">
244 @@ -245,7 +238,7 @@
245 </antcall>
246 </target-->
247
248 - <target name="jstl" depends="init, servlet16">
249 + <target name="jstl" depends="init">
250 <antcall target="module" inheritRefs="true">
251 <param name="module.name" value="jstl"/>
252 <param name="module.jar" value="jstl-11.jar"/>
253 @@ -344,7 +337,7 @@
254 </antcall>
255 </target>
256
257 - <target name="resin-kernel" depends="init, cdi, servlet16, version">
258 + <target name="resin-kernel" depends="init, cdi, version">
259 <antcall target="module" inheritRefs="true">
260 <param name="module.name" value="kernel"/>
261 <param name="module.dist" value="${lib}"/>
262 @@ -483,7 +476,7 @@
263 </copy>
264 </target>
265
266 - <target name="javaee" depends="ejb, jca, jms, jpa, servlet16, cdi, jcache, jstl, jta">
267 + <target name="javaee" depends="ejb, jca, jms, jpa, cdi, jcache, jstl, jta">
268 <!--
269 - javaee-16.jar
270 -->
271 @@ -528,10 +521,6 @@
272 </fileset>
273 -->
274
275 - <fileset dir="${resin.modules}/servlet16/classes">
276 - <exclude name="**/.*"/>
277 - </fileset>
278 -
279 <fileset dir="${resin.modules}/webbeans/classes">
280 <exclude name="**/.*"/>
281 </fileset>
282 @@ -676,20 +665,12 @@
283 </copy>
284 </target>
285
286 - <target name="ext" depends="init, resin">
287 - <copy todir="${install}/lib" preservelastmodified="true">
288 - <fileset dir="${ext}">
289 - </fileset>
290 - </copy>
291 - </target>
292 -
293 <target name="webapps" depends="init, doc, quercus">
294 </target>
295
296 <target name="doc" depends="init">
297 <mkdir dir="${install}/webapps"/>
298
299 - <!--
300 <jar jarfile="${install}/webapps/resin-doc.war"
301 compress="true" index="${jar.index}" update="${jar.update}">
302
303 @@ -703,7 +684,6 @@
304 <exclude name="**/.svnignore"/>
305 </fileset>
306 </jar>
307 - -->
308 </target>
309
310 <target name="javadoc" depends="init">
311 @@ -725,7 +705,6 @@
312
313 <packageset dir="${modules}/ejb/src"/>
314 <packageset dir="${modules}/hessian/src"/>
315 - <packageset dir="${modules}/servlet16/src"/>
316 <packageset dir="${modules}/jcache/src"/>
317 <packageset dir="${modules}/jpa/src"/>
318 <packageset dir="${modules}/jaxstream/src"/>
319 @@ -851,7 +830,7 @@
320 <delete dir="${dist}/${dist.name}"/>
321 </target>
322
323 - <target name="dist" depends="dist.clean, configure, compile, update, junit, eclipselink, artifacts, resin.dist.build, dist.package, quercus.war"/>
324 + <target name="dist" depends="dist.clean, configure, compile, update, junit, artifacts, resin.dist.build, dist.package, quercus.war"/>
325
326 <target name="configure" depends="init">
327 <copy tofile="modules/c/src/resin/Makefile.in"
328
329
330
331 1.1 src/patchsets/resin/4.0.26/resin-4.0.26-classpath.patch
332
333 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.26/resin-4.0.26-classpath.patch?rev=1.1&view=markup
334 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.26/resin-4.0.26-classpath.patch?rev=1.1&content-type=text/plain
335
336 Index: resin-4.0.26-classpath.patch
337 ===================================================================
338 diff -Nru resin-4.0.26.vanilla/modules/resin/src/boot-manifest resin-4.0.26/modules/resin/src/boot-manifest
339 --- resin-4.0.26.vanilla/modules/resin/src/boot-manifest 2012-03-04 11:33:19.199434119 +0100
340 +++ resin-4.0.26/modules/resin/src/boot-manifest 2012-03-04 11:55:06.378574678 +0100
341 @@ -1,5 +1,5 @@
342 Main-Class: com.caucho.server.bootstrap.ResinBoot
343 -Class-Path: resin.jar jta-101.jar isorelax.jar jsdk-24.jar jmx-12.jar jca-15.jar jstl-11.jar
344 +Class-Path: resin.jar jta-101.jar isorelax.jar resin-servlet-api.jar jmx-12.jar jca-15.jar jstl-11.jar
345 Extension-Name: com.caucho.server.bootstrap
346 Implementation-Vendor: Caucho Technology, Inc.
347 Implementation-Version: 3.0.1
348 diff -Nru resin-4.0.26.vanilla/modules/resin/src/manifest resin-4.0.26/modules/resin/src/manifest
349 --- resin-4.0.26.vanilla/modules/resin/src/manifest 2012-03-04 11:33:19.619435239 +0100
350 +++ resin-4.0.26/modules/resin/src/manifest 2012-03-04 11:55:06.378574678 +0100
351 @@ -1,4 +1,4 @@
352 -Class-Path: javaee-16.jar javaee-15.jar pro.jar license.jar hessian.jar quercus.jar resin-kernel.jar jcache-16.jar webservices-api.jar
353 +Class-Path: javaee-16.jar javaee-15.jar pro.jar license.jar hessian.jar quercus.jar resin-kernel.jar jcache-16.jar webservices-api.jar resin-servlet-api.jar
354 Implementation-Vendor: Caucho Technology, Inc.
355 Implementation-Version: 4.0.26
356 J2EE-DeploymentFactory-Implementation-Class: com.caucho.j2ee.deployclient.DeploymentFactoryImpl
357 diff -Nru resin-4.0.26.vanilla/modules/resin/src/manifest.in resin-4.0.26/modules/resin/src/manifest.in
358 --- resin-4.0.26.vanilla/modules/resin/src/manifest.in 2012-03-04 11:33:19.615435236 +0100
359 +++ resin-4.0.26/modules/resin/src/manifest.in 2012-03-04 11:55:06.378574678 +0100
360 @@ -1,4 +1,4 @@
361 -Class-Path: javaee-16.jar javaee-15.jar pro.jar license.jar hessian.jar quercus.jar resin-kernel.jar jcache-16.jar webservices-api.jar
362 +Class-Path: javaee-16.jar javaee-15.jar pro.jar license.jar hessian.jar quercus.jar resin-kernel.jar jcache-16.jar webservices-api.jar resin-servlet-api.jar
363 Implementation-Vendor: Caucho Technology, Inc.
364 Implementation-Version: @VERSION@
365 J2EE-DeploymentFactory-Implementation-Class: com.caucho.j2ee.deployclient.DeploymentFactoryImpl
366
367
368
369 1.1 src/patchsets/resin/4.0.26/resin-4.0.26-configure.patch
370
371 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.26/resin-4.0.26-configure.patch?rev=1.1&view=markup
372 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.26/resin-4.0.26-configure.patch?rev=1.1&content-type=text/plain
373
374 Index: resin-4.0.26-configure.patch
375 ===================================================================
376 diff -Nru resin-4.0.26.vanilla/configure.ac resin-4.0.26/configure.ac
377 --- resin-4.0.26.vanilla/configure.ac 2012-03-04 11:33:20.347437179 +0100
378 +++ resin-4.0.26/configure.ac 2012-03-04 11:51:52.430404582 +0100
379 @@ -783,16 +783,16 @@
380 linux*)
381 LD_SHLIB=${CC}
382
383 - CFLAGS="$CFLAGS -pthread -fPIC -fno-omit-frame-pointer -O2"
384 + CFLAGS="$CFLAGS -pthread -fPIC -fno-omit-frame-pointer"
385 CFLAGS_JNI="$CFLAGS_JNI -fPIC"
386 LDFLAGS_SHLIB="-shared -fPIC"
387
388 if test -n "$b64_jni"; then
389 - CFLAGS_JNI="$CFLAGS_JNI -m64 -fPIC"
390 - LDFLAGS_SHLIB="$LDFLAGS_SHLIB -m64"
391 + CFLAGS_JNI="$CFLAGS_JNI -fPIC"
392 + LDFLAGS_SHLIB="$LDFLAGS_SHLIB"
393 else
394 - CFLAGS_JNI="$CFLAGS_JNI -m32"
395 - LDFLAGS_SHLIB="$LDFLAGS_SHLIB -m32"
396 + CFLAGS_JNI="$CFLAGS_JNI"
397 + LDFLAGS_SHLIB="$LDFLAGS_SHLIB"
398 fi
399 ;;
400
401 @@ -805,12 +805,12 @@
402 CFLAGS_JNI="$CFLAGS_JNI -fPIC -fno-omit-frame-pointer"
403
404 if test -n "$b64"; then
405 - CFLAGS="$CFLAGS -m64"
406 - LDFLAGS_SHLIB="-m64 -R /usr/sfw/lib/64 -R /usr/local/lib/sparcv9"
407 + CFLAGS="$CFLAGS"
408 + LDFLAGS_SHLIB="-R /usr/sfw/lib/64 -R /usr/local/lib/sparcv9"
409 fi
410 if test -n "${b64_jni}"; then
411 - CFLAGS_JNI="$CFLAGS_JNI -m64"
412 - LDFLAGS_SHLIB="-m64 -R /usr/sfw/lib/64 -R /usr/local/lib/sparcv9"
413 + CFLAGS_JNI="$CFLAGS_JNI"
414 + LDFLAGS_SHLIB="-R /usr/sfw/lib/64 -R /usr/local/lib/sparcv9"
415 fi
416
417 LDFLAGS_SHLIB="$LDFLAGS_SHLIB -shared"
418 @@ -819,11 +819,11 @@
419 CFLAGS_SHLIB="-mt -KPIC -xO2"
420
421 if test -n "$b64"; then
422 - CFLAGS="$CFLAGS -m64"
423 + CFLAGS="$CFLAGS"
424 fi
425 if test -n "$b64_jni"; then
426 - CFLAGS_JNI="$CFLAGS_JNI -m64"
427 - LDFLAGS_SHLIB="$LDFLAGS_SHLIB -m64 -G -mt -z defs -z text"
428 + CFLAGS_JNI="$CFLAGS_JNI"
429 + LDFLAGS_SHLIB="$LDFLAGS_SHLIB -G -mt -z defs -z text"
430 LDFLAGS_SHLIB="$LDFLAGS_SHLIB -R/usr/lib/64:/usr/sfw/lib/64:/usr/local/lib/sparcv9 -YP,/usr/lib/64:/usr/sfw/lib/64:/usr/local/lib/sparcv9"
431 fi
432
433 @@ -840,7 +840,7 @@
434 LDFLAGS_SHLIB="-arch x86_64 $LDFLAGS_SHLIB"
435 fi
436 if test -n "$b64_jni"; then
437 - CFLAGS_JNI="$CFLAGS_JNI -m64"
438 + CFLAGS_JNI="$CFLAGS_JNI"
439 LDFLAGS_SHLIB="-arch x86_64 $LDFLAGS_SHLIB"
440 fi
441 ;;
442 @@ -871,8 +871,8 @@
443 # case "$target_cpu" in
444 # x86_64)
445 # if test -z "$b64_jni"; then
446 -# CFLAGS_JNI="$CFLAGS_JNI -m32"
447 -# LDFLAGS_SHLIB="$LDFLAGS_SHLIB -m32"
448 +# CFLAGS_JNI="$CFLAGS_JNI"
449 +# LDFLAGS_SHLIB="$LDFLAGS_SHLIB"
450 # fi
451 # ;;
452 # esac
453 diff -Nru resin-4.0.26.vanilla/modules/unix/src/configure.in resin-4.0.26/modules/unix/src/configure.in
454 --- resin-4.0.26.vanilla/modules/unix/src/configure.in 2012-03-04 11:33:18.539432358 +0100
455 +++ resin-4.0.26/modules/unix/src/configure.in 2012-03-04 11:51:09.066288882 +0100
456 @@ -434,7 +434,7 @@
457 LD_SHLIB=${CC}
458
459 if test -n "$b64"; then
460 - CFLAGS="$CFLAGS -m64"
461 + CFLAGS="$CFLAGS"
462 LDFLAGS_SHLIB="-shared -fPIC"
463 fi
464 ;;
465 @@ -444,7 +444,7 @@
466 CFLAGS_SHLIB="-fPIC"
467
468 if test -n "$b64"; then
469 - CFLAGS="$CFLAGS -m64"
470 + CFLAGS="$CFLAGS"
471 fi
472 else
473 CFLAGS_SHLIB="-KPIC"
474
475
476
477 1.1 src/patchsets/resin/4.0.26/resin-4.0.26-ldflags.patch
478
479 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.26/resin-4.0.26-ldflags.patch?rev=1.1&view=markup
480 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/resin/4.0.26/resin-4.0.26-ldflags.patch?rev=1.1&content-type=text/plain
481
482 Index: resin-4.0.26-ldflags.patch
483 ===================================================================
484 diff -Nru resin-4.0.26.vanilla/modules/c/src/resin_os/Makefile.in resin-4.0.26/modules/c/src/resin_os/Makefile.in
485 --- resin-4.0.26.vanilla/modules/c/src/resin_os/Makefile.in 2012-03-04 11:33:18.455432143 +0100
486 +++ resin-4.0.26/modules/c/src/resin_os/Makefile.in 2012-03-04 12:02:44.379794892 +0100
487 @@ -20,10 +20,10 @@
488 all : libresin_os.$(SO)
489
490 libresin_os.so : $(OBJ)
491 - $(CC) $(LDFLAGS_SHLIB) -o $@ $(OBJ) $(PROXY_LIBS)
492 + $(CC) $(LDFLAGS_SHLIB) $(LDFLAGS) -o $@ $(OBJ) $(PROXY_LIBS)
493
494 libresin_os.jnilib : $(OBJ)
495 - $(CC) $(LDFLAGS_SHLIB) -framework JavaVM -o $@ $(OBJ) $(PROXY_LIBS)
496 + $(CC) $(LDFLAGS_SHLIB) -framework JavaVM $(LDFLAGS) -o $@ $(OBJ) $(PROXY_LIBS)
497
498 boot.o : Makefile resin.h
499 java.o : Makefile resin.h
500 diff -Nru resin-4.0.26.vanilla/modules/c/src/resinssl/Makefile.in resin-4.0.26/modules/c/src/resinssl/Makefile.in
501 --- resin-4.0.26.vanilla/modules/c/src/resinssl/Makefile.in 2012-03-04 11:33:18.475432198 +0100
502 +++ resin-4.0.26/modules/c/src/resinssl/Makefile.in 2012-03-04 12:05:36.972254697 +0100
503 @@ -21,10 +21,10 @@
504 all : libresinssl.$(SO)
505
506 libresinssl.so : $(OBJ)
507 - $(CC) $(LDFLAGS_SHLIB) -o $@ $(OBJ) $(PROXY_LIBS)
508 + $(CC) $(LDFLAGS_SHLIB) $(LDFLAGS) -o $@ $(OBJ) $(PROXY_LIBS)
509
510 libresinssl.jnilib : $(OBJ)
511 - $(CC) $(LDFLAGS_SHLIB) -framework JavaVM -o $@ $(OBJ) $(PROXY_LIBS)
512 + $(CC) $(LDFLAGS_SHLIB) -framework JavaVM $(LDFLAGS) -o $@ $(OBJ) $(PROXY_LIBS)
513
514 $(OBJ) : ../resin/resin.h Makefile
Report Message
Find on MARC Find on Google Groups