Ignore:
Timestamp:
10/18/10 11:25:46 (10 years ago)
Author:
sjm84
Message:

Added an LD_LIBRARY_PATH pointing to the gnome-lib lib directory for the compiling stage of the release kit

File:
1 edited

Legend:

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

    r23117 r23153  
    4949        </if>
    5050
    51         <!-- mac or linux: compile the support library -->
     51        <!-- mac or linux: get the support library -->
    5252        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
    5353            <!-- checkout the gnome support library extension-->
     
    6565                </exec>
    6666
    67                 <exec executable="/bin/tar" dir="${basedir}/compiled/ext">
     67                <exec executable="tar" dir="${basedir}/compiled/ext">
    6868                    <arg value="xvzf"/>
    6969                    <arg value="gnome-lib-${os.shell}.tar.gz"/>
     
    178178                <arg line="CXXFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib/linux/include&quot;"/>
    179179                <arg line="LDFLAGS=&quot;-static -L${basedir}/compiled/ext/gnome-lib/linux/lib&quot;"/>
     180                <arg line="PKG_CONFIG_PATH=&quot;${basedir}/compiled/ext/gnome-lib/linux/lib/pkgconfig&quot;"/>
    180181            </exec>
    181182
     
    205206        <!-- mac and linux: compile -->
    206207        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
     208            <!-- LD_LIBRARY_PATH is DYLD_LIBRARY_PATH on mac-->
     209            <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
     210                <property key="libpathvar" value="DYLD_LIBRARY_PATH"/>
     211            <else>
     212                <property key="libpathvar" value="LD_LIBRARY_PATH"/>
     213            </else>
     214            </if>
     215
    207216            <!-- make -->
    208             <exec dir="${basedir}/compiled" executable="make" failonerror="true"/>
     217            <exec dir="${basedir}/compiled" executable="make" failonerror="true">
     218                <arg line="${libpathvar}=&quot;${basedir}/compiled/ext/gnome-lib/linux/lib&quot;"/>
     219            </exec>
    209220
    210221            <!-- make install -->
Note: See TracChangeset for help on using the changeset viewer.