Changeset 36228


Ignore:
Timestamp:
2022-05-30T14:52:25+12:00 (5 weeks ago)
Author:
kjdon
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

    r35605 r36228  
    176176        <!-- linux only -->
    177177        <else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
    178             <!-- add static to configure.in -->
    179             <rsr file="${basedir}/compiled/configure.in" pattern="^LDFLAGS=.*$" replacement="LDFLAGS=-static"/>
     178        <if><bool><equals arg1="${x64}" arg2="false"/></bool>
     179           <!-- add static to configure.in, but not for x64. Why?? -->
     180           <echo>********* adding -static to compiled/configure.in</echo>
     181           <rsr file="${basedir}/compiled/configure.in" pattern="^LDFLAGS=.*$" replacement="LDFLAGS=-static"/>
     182           <!-- set environment in packages/configure -->
     183           <rsr file="${basedir}/compiled/common-src/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;"/>
     184           <rsr file="${basedir}/compiled/build-src/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;"/>
     185
     186        </if>
    180187            <exec dir="${basedir}/compiled" executable="autoconf" output="${basedir}/compiled/configure">
    181188                <arg value="configure.in"/>
    182189            </exec>
    183190
    184             <!-- set environment in packages/configure -->
    185             <rsr file="${basedir}/compiled/common-src/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;"/>
    186             <rsr file="${basedir}/compiled/build-src/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;"/>
    187191
    188192            <!-- run configure -->
     
    206210            <rsr file="${basedir}/compiled/build-src/packages/rtftohtml/rtftohtml_src/Makefile" pattern="(-o rtftohtml.{2}EXEEXT.{1})" replacement="$1 -static"/>
    207211
    208         <!-- mac only -->
     212            <!-- this bit from the lin32 compile-->
     213            <if><bool><equals arg1="${x64}" arg2="false"/></bool>
     214            <echo>******** modifying wget Makefile for linux 32</echo>
     215            <rsr file="${basedir}/compiled/build-src/packages/wget/wget-1.17.1-gs/src/Makefile" pattern="^LDFLAGS =(.*) -static(.*)$" replacement="LDFLAGS = $1 $2"/>
     216            </if>
     217            <!-- mac only -->
    209218        <else><if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
    210219            <!-- run configure -->
     
    260269        </if>
    261270
     271        <!-- 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.-->
     272
     273       
    262274        <!-- Delete all but the lib folder and the setup.bash script of the gnome support library -->
    263275        <if><bool><and>
Note: See TracChangeset for help on using the changeset viewer.