tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r695003 - in /tomcat/connectors/trunk/jk: native/apache-1.3/Makefile.apxs.in native/apache-1.3/Makefile.in native/apache-2.0/Makefile.apxs.in native/apache-2.0/Makefile.in native/configure.in xdocs/miscellaneous/changelog.xml
Date Sat, 13 Sep 2008 18:51:06 GMT
Author: rjung
Date: Sat Sep 13 11:51:06 2008
New Revision: 695003

URL: http://svn.apache.org/viewvc?rev=695003&view=rev
Log:
Use correct ld flags provided by apxs when building module.
Prevents some crashes on AIX for httpd 1.3 module.

Modified:
    tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in
    tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.in
    tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in
    tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in
    tomcat/connectors/trunk/jk/native/configure.in
    tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in?rev=695003&r1=695002&r2=695003&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.apxs.in Sat Sep 13 11:51:06 2008
@@ -33,7 +33,7 @@
 all: mod_jk.so
 
 mod_jk.so:
-	$(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${JAVA_INCL} "${APXSLDFLAGS}" mod_jk.c ${APACHE_OBJECTS}
+	$(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${JAVA_INCL} ${APXSLDFLAGS} mod_jk.c ${APACHE_OBJECTS}
 
 clean:
 	rm -f *.o *.lo *.a *.la *.so *.so.* *.slo

Modified: tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.in
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.in?rev=695003&r1=695002&r2=695003&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.in (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/Makefile.in Sat Sep 13 11:51:06 2008
@@ -49,7 +49,7 @@
 JK_CFLAGS  = $(JK_INCL) $(JAVA_INCL) $(APACHE_CFLAGS)
 COMPILE    = $(CC)
 SH_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) $(JK_CFLAGS)
-MOD_LINK   = $(LIBTOOL) --mode=link $(CC)
+MOD_LINK   = $(LIBTOOL) --mode=link $(CC) @APXSLDFLAGS@
 
 include ../common/list.mk
 

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in?rev=695003&r1=695002&r2=695003&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.apxs.in Sat Sep 13 11:51:06 2008
@@ -33,7 +33,7 @@
 all: mod_jk.la
 
 mod_jk.la:
-	$(APXS)  -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" "${JAVA_INCL}" "${APXSLDFLAGS}" mod_jk.c
${APACHE_OBJECTS}
+	$(APXS)  -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" "${JAVA_INCL}" ${APXSLDFLAGS} mod_jk.c
${APACHE_OBJECTS}
 
 install: mod_jk.la
 	$(APXS) -i mod_jk.la

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in?rev=695003&r1=695002&r2=695003&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/Makefile.in Sat Sep 13 11:51:06 2008
@@ -23,6 +23,7 @@
 MKDIR=@MKDIR@
 APXSCFLAGS=@APXSCFLAGS@
 APXSCPPFLAGS=@APXSCPPFLAGS@
+APXSLDFLAGS=@APXSLDFLAGS@
 CC=@CC@
 
 # Defaults
@@ -78,7 +79,7 @@
 # APXS will compile every file, this is derived from apxs
 
 mod_jk.la: mod_jk.lo $(APACHE_OBJECTS)
-	$(LIBTOOL) --mode=link ${COMPILE} `${APXS} -q LDFLAGS` -o $@ -module -rpath ${libexecdir}
-avoid-version mod_jk.lo $(APACHE_OBJECTS)
+	$(LIBTOOL) --mode=link ${COMPILE} $(APXSLDFLAGS) -o $@ -module -rpath ${libexecdir} -avoid-version
mod_jk.lo $(APACHE_OBJECTS)
 
 mod_jk.so: mod_jk.la
 	../scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_jk.la `pwd`

Modified: tomcat/connectors/trunk/jk/native/configure.in
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/configure.in?rev=695003&r1=695002&r2=695003&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/configure.in (original)
+++ tomcat/connectors/trunk/jk/native/configure.in Sat Sep 13 11:51:06 2008
@@ -105,7 +105,11 @@
                 WEBSERVER="apache-1.3"
                 APXSCC="`$APXS -q CC`"
                 APXSCFLAGS="`$APXS -q CFLAGS` -DJK_PREFORK"
-                APXS_CPPFLAGS=""
+                APXSCPPFLAGS=""
+                dnl sed magic needed to prepend each token with "-Wl," s.t. libtool
+                dnl detects those arguments correctly as ld flags.
+                dnl Double square brackets needed, because single ones will be removed by
autoconf.
+                APXSLDFLAGS="`$APXS -q LDFLAGS_SHLIB | $SED -e 's/\([[^ ]]*\)/-Wl,\1/g'`"
             else
                 WEBSERVER="apache-2.0"
                 APRINCLUDEDIR=""
@@ -117,6 +121,10 @@
                 APXSCC="`$APXS -q CC`"
                 APXSCFLAGS="`${APXS} -q CFLAGS` `${APXS} -q EXTRA_CFLAGS` -DHAVE_APR ${APRINCLUDEDIR}"
                 APXSCPPFLAGS="`${APXS} -q EXTRA_CPPFLAGS`"
+                dnl sed magic needed to prepend each token with "-Wl," s.t. libtool
+                dnl detects those arguments correctly as ld flags.
+                dnl Double square brackets needed, because single ones will be removed by
autoconf.
+                APXSLDFLAGS="`$APXS -q LDFLAGS | $SED -e 's/\([[^ ]]*\)/-Wl,\1/g'`"
                 APACHE_CONFIG_VARS="`${APXS} -q exp_installbuilddir`/config_vars.mk"
                 LIBTOOL=`$APXS -q LIBTOOL`
             fi
@@ -520,15 +528,14 @@
 AC_SUBST(CFLAGS)
 
 dnl the APXSCFLAGS is given by apxs to the C compiler
-dnl the APXSLDFLAGS is given to the linker (for APRVARS).
-dnl APXSLDFLAGS=""
-dnl APXSCFLAGS=""
+dnl the APXSLDFLAGS is normally empty but APXSCFLAGS is not.
 if ${TEST} -n "${CFLAGS}" ; then
     APXSCFLAGS="${APXSCFLAGS} ${CFLAGS}"
 fi
-dnl the APXSLDFLAGS is normally empty but APXSCFLAGS is not.
+dnl the APXSLDFLAGS is given to the linker (for APRVARS).
 if ${TEST} -n "${LDFLAGS}" ; then
-    APXSLDFLAGS="-Wl,${LDFLAGS}"
+    TMPLDFLAGS="`${ECHO} ${LDFLAGS} | $SED -e 's/\([[^ ]]*\)/-Wl,\1/g'`"
+    APXSLDFLAGS="${APXSLDFLAGS} ${TMPLDFLAGS}"
 fi
 AC_SUBST(APXSCFLAGS)
 AC_SUBST(APXSCPPFLAGS)

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=695003&r1=695002&r2=695003&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sat Sep 13 11:51:06 2008
@@ -47,6 +47,10 @@
         Added connection_keepalive directive. (mturk)
       </update>
       <fix>
+        Apache: Use correct ld flags provided by apxs when building module.
+        Prevents some crashes on AIX for httpd 1.3 module. (rjung)
+      </fix>
+      <fix>
         Documentation: "val" attribute numbering in status worker
         needs to start with 0 instead of 1. (rjung)
       </fix>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message