Changeset 36228 for main

Timestamp:

2022-05-30T14:52:25+12:00 (23 months ago)

Author:

kjdon

Message:

adding in some of the differences for linux 32 and 64 bit

File:

• main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml (modified) (3 diffs)

main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

@@ -176 +176 @@
         <!-- linux only -->
         <else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
-            <!-- add static to configure.in -->
-            <rsr file="${basedir}/compiled/configure.in" pattern="^LDFLAGS=.*$" replacement="LDFLAGS=-static"/>
+        <if><bool><equals arg1="${x64}" arg2="false"/></bool>
+           <!-- add static to configure.in, but not for x64. Why?? -->
+           <echo>********* adding -static to compiled/configure.in</echo>
+           <rsr file="${basedir}/compiled/configure.in" pattern="^LDFLAGS=.*$" replacement="LDFLAGS=-static"/>
+           <!-- set environment in packages/configure -->
+           <rsr file="${basedir}/compiled/common-src/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;"/>
+           <rsr file="${basedir}/compiled/build-src/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;"/>
+
+        </if>
             <exec dir="${basedir}/compiled" executable="autoconf" output="${basedir}/compiled/configure">
                 <arg value="configure.in"/>
             </exec>
 
-            <!-- set environment in packages/configure -->
-            <rsr file="${basedir}/compiled/common-src/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;"/>
-            <rsr file="${basedir}/compiled/build-src/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;"/>
 
             <!-- run configure -->
@@ -206 +210 @@
             <rsr file="${basedir}/compiled/build-src/packages/rtftohtml/rtftohtml_src/Makefile" pattern="(-o rtftohtml.{2}EXEEXT.{1})" replacement="$1 -static"/>
 
-        <!-- mac only -->
+            <!-- this bit from the lin32 compile-->
+            <if><bool><equals arg1="${x64}" arg2="false"/></bool>
+            <echo>******** modifying wget Makefile for linux 32</echo>
+            <rsr file="${basedir}/compiled/build-src/packages/wget/wget-1.17.1-gs/src/Makefile" pattern="^LDFLAGS =(.*) -static(.*)$" replacement="LDFLAGS = $1 $2"/>
+            </if>
+            <!-- mac only -->
         <else><if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
             <!-- run configure -->
@@ -260 +269 @@
         </if>
 
+        <!-- in mac and linux 64 bit versions, we copy IsisGdl from caveat-emptor. However, now that it compiles under 64 bit, I don't think we need to do that anymore.-->
+
+        
         <!-- Delete all but the lib folder and the setup.bash script of the gnome support library -->
         <if><bool><and>