carnold 2005/02/16 16:55:34
Modified: . apr-build.xml apriconv-build.xml aprutil-build.xml
build.xml
Log:
LOGCXX-25: Add -Duse-pic=true switch to force -fPIC for AMD64
Revision Changes Path
1.8 +11 -0 logging-log4cxx/apr-build.xml
Index: apr-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/apr-build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apr-build.xml 16 Feb 2005 16:31:14 -0000 1.7
+++ apr-build.xml 17 Feb 2005 00:55:34 -0000 1.8
@@ -71,6 +71,13 @@
<target name="init" depends="win-init, unix-init">
<property environment="env"/>
+ <condition property="pic-option" value="-fPIC">
+ <and>
+ <isset property="is-gcc"/>
+ <istrue value="${use-pic}"/>
+ </and>
+ </condition>
+
<condition property="is-debug" value="true">
<istrue value="${debug}"/>
</condition>
@@ -157,6 +164,7 @@
<define name="WIN32" value="1"/>
</defineset>
<defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
+ <compilerarg value="${pic-option}" if="pic-option"/>
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
<libset libs="pthread dl" if="is-unix"/>
<libset libs="cw32mt" if="is-bcc"/>
@@ -179,6 +187,7 @@
<define name="WIN32" value="1"/>
</defineset>
<defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
+ <compilerarg value="${pic-option}" if="pic-option"/>
<libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
<libset libs="cw32mt" if="is-bcc"/>
<libset libs="pthread dl" if="is-unix"/>
@@ -309,6 +318,7 @@
<define name="WIN32" value="1"/>
</defineset>
<defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
+ <compilerarg value="${pic-option}" if="pic-option"/>
<libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
<libset libs="cw32mt" if="is-bcc"/>
<project type="${project.type}" outfile="${project.dir}/mod_test"
if="project.if"/>
@@ -347,6 +357,7 @@
<define name="WIN32" value="1"/>
</defineset>
<defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
+ <compilerarg value="${pic-option}" if="pic-option"/>
<libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
<libset libs="cw32mt" if="is-bcc"/>
<libset libs="pthread dl" if="is-unix"/>
1.7 +9 -0 logging-log4cxx/apriconv-build.xml
Index: apriconv-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/apriconv-build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apriconv-build.xml 16 Feb 2005 16:31:14 -0000 1.6
+++ apriconv-build.xml 17 Feb 2005 00:55:34 -0000 1.7
@@ -81,6 +81,13 @@
<condition property="is-debug" value="true">
<istrue value="${debug}"/>
</condition>
+ <condition property="pic-option" value="-fPIC">
+ <and>
+ <isset property="is-gcc"/>
+ <istrue value="${use-pic}"/>
+ </and>
+ </condition>
+
<condition property="apriconv.lib.dir"
value="${build.dir}/debug/${apriconv.lib.type}">
<isset property="is-debug"/>
</condition>
@@ -162,6 +169,7 @@
<defineset define="APR_DECLARE_STATIC" unless="is-apr-shared"/>
<defineset define="WIN32" if="is-windows"/>
<defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
+ <compilerarg value="${pic-option}" if="pic-option"/>
<project type="${project.type}" outfile="${project.dir}/apriconv"
if="project.if"/>
</cc>
</target>
@@ -184,6 +192,7 @@
<defineset define="APR_DECLARE_STATIC" unless="is-apr-shared"/>
<defineset define="WIN32" if="is-windows"/>
<defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
+ <compilerarg value="${pic-option}" if="pic-option"/>
<libset libs="apriconv${lib-suffix}" dir="${apriconv.lib.dir}"/>
<libset libs="apr-1${lib-suffix}" dir="${apr.lib.dir}"/>
<libset libs="advapi32 ws2_32 mswsock rpcrt4" if="is-windows"/>
1.8 +10 -0 logging-log4cxx/aprutil-build.xml
Index: aprutil-build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/aprutil-build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aprutil-build.xml 16 Feb 2005 16:31:14 -0000 1.7
+++ aprutil-build.xml 17 Feb 2005 00:55:34 -0000 1.8
@@ -82,6 +82,13 @@
<condition property="is-debug" value="true">
<istrue value="${debug}"/>
</condition>
+ <condition property="pic-option" value="-fPIC">
+ <and>
+ <isset property="is-gcc"/>
+ <istrue value="${use-pic}"/>
+ </and>
+ </condition>
+
<condition property="aprutil.lib.dir"
value="${build.dir}/debug/${aprutil.lib.type}">
<isset property="is-debug"/>
</condition>
@@ -194,6 +201,7 @@
<defineset define="APR_DECLARE_STATIC" if="is-apr-shared"/>
<defineset define="WIN32" if="is-windows"/>
<defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
+ <compilerarg value="${pic-option}" if="pic-option"/>
<libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
<libset dir="${apriconv.lib.dir}" libs="apriconv${lib-suffix}"/>
@@ -224,6 +232,7 @@
<define name="WIN32" value="1"/>
</defineset>
<defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
+ <compilerarg value="${pic-option}" if="pic-option"/>
<libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
<libset dir="${aprutil.lib.dir}" libs="aprutil-1${lib-suffix}"/>
<libset libs="cw32mt" if="is-bcc"/>
@@ -387,6 +396,7 @@
<define name="WIN32" value="1"/>
</defineset>
<defineset define="_HAVE_CONFIG_H _REENTRANT _GNU_SOURCE"
if="is-gcc"/>
+ <compilerarg value="${pic-option}" if="pic-option"/>
<libset dir="${apr.lib.dir}" libs="apr-1${lib-suffix}"/>
<libset dir="${aprutil.lib.dir}" libs="aprutil-1${lib-suffix}"/>
<libset libs="pthread dl crypt" if="is-unix"/>
1.43 +17 -0 logging-log4cxx/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4cxx/build.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- build.xml 15 Feb 2005 23:55:58 -0000 1.42
+++ build.xml 17 Feb 2005 00:55:34 -0000 1.43
@@ -140,6 +140,13 @@
</or>
</condition>
+ <condition property="pic-option" value="-fPIC">
+ <and>
+ <isset property="is-gcc"/>
+ <istrue value="${use-pic}"/>
+ </and>
+ </condition>
+
<property name="lib.prefix" value="lib"/>
<property name="lib.extension" value=".a"/>
<property name="project.type" value="cbuilderx"/>
@@ -357,6 +364,7 @@
<property name="project.type" value="${project.type}"/>
<property name="project.dir" value="${project.dir}"/>
<property name="project.if.value" value="${project.if}"/>
+ <property name="use-pic" value="${use-pic}"/>
</ant>
</target>
@@ -396,6 +404,7 @@
<property name="project.type" value="${project.type}"/>
<property name="project.dir" value="${project.dir}"/>
<property name="project.if.value" value="${project.if}"/>
+ <property name="use-pic" value="${use-pic}"/>
</ant>
</target>
@@ -442,6 +451,7 @@
<property name="project.type" value="${project.type}"/>
<property name="project.dir" value="${project.dir}"/>
<property name="project.if.value" value="${project.if}"/>
+ <property name="use-pic" value="${use-pic}"/>
</ant>
</target>
@@ -476,6 +486,7 @@
<property name="project.type" value="${project.type}"/>
<property name="project.dir" value="${project.dir}"/>
<property name="project.if.value" value="${project.if}"/>
+ <property name="use-pic" value="${use-pic}"/>
</ant>
<property name="cppunit.include.dir" value="${cppunit.dir}/include"/>
<property name="cppunit.lib.dir"
value="${executable.dir}/${cppunit.lib.type}"/>
@@ -519,6 +530,7 @@
projectsOnly="${projectsOnly}">
<compilerarg value="-Weffc++"/>
<compilerarg value="-Wall"/>
+ <compilerarg value="${pic-option}" if="pic-option"/>
<fileset dir="${build.dir}/header-check"
includes="**/*.cpp"/>
<includepath path="mock"/>
<includepath path="include"/>
@@ -558,6 +570,7 @@
<defineset define="APR_DECLARE_STATIC" if="apr-static"/>
<defineset define="APU_DECLARE_STATIC" if="aprutil-static"/>
<defineset define="WIN32" if="is-windows"/>
+ <compilerarg value="${pic-option}" if="pic-option"/>
<libset libs="advapi32 odbc32 ws2_32" if="is-windows"/>
<libset libs="stdc++" if="is-gcc"/>
<libset libs="cw32mt" if="is-bcc"/>
@@ -597,6 +610,7 @@
<defineset define="APU_DECLARE_STATIC" if="aprutil-static"/>
<defineset define="API_DECLARE_STATIC" if="iconv-static"/>
+ <compilerarg value="${pic-option}" if="pic-option"/>
<libset libs="log4cxx${lib-suffix}" dir="${log4cxx.lib.dir}"/>
@@ -700,6 +714,7 @@
</fileset>
<includepath path="${include.dir}"/>
<includepath path="${apr.include.dir}"/>
+ <compilerarg value="${pic-option}" if="pic-option"/>
<libset libs="log4cxx${lib-suffix}" dir="${log4cxx.lib.dir}"/>
<libset libs="${apr.lib.name}${lib-suffix}" dir="${apr.lib.dir}"
if="apr.lib.dir"/>
<libset libs="${apr.lib.name}${lib-suffix}" unless="apr.lib.dir"/>
@@ -741,6 +756,7 @@
<includepath path="${apr.include.dir}"/>
<defineset define="APR_DECLARE_STATIC" if="apr-static"/>
<defineset define="WIN32" if="is-windows"/>
+ <compilerarg value="${pic-option}" if="pic-option"/>
<libset libs="log4cxx${lib-suffix}" dir="${log4cxx.lib.dir}"/>
<libset libs="${apr.lib.name}${lib-suffix}" dir="${apr.lib.dir}"
if="apr.lib.dir"/>
<libset libs="${apr.lib.name}${lib-suffix}" unless="apr.lib.dir"/>
@@ -785,6 +801,7 @@
<includepath path="${apr.include.dir}"/>
<defineset define="APR_DECLARE_STATIC" if="apr-static"/>
<defineset define="WIN32" if="is-windows"/>
+ <compilerarg value="${pic-option}" if="pic-option"/>
<libset libs="${apr.lib.name}${lib-suffix}" dir="${apr.lib.dir}"
if="apr.lib.dir"/>
<libset libs="${apr.lib.name}${lib-suffix}" unless="apr.lib.dir"/>
<libset libs="${aprutil.lib.name}${lib-suffix}"
dir="${aprutil.lib.dir}" if="aprutil.lib.dir"/>
