Show
Ignore:
Timestamp:
14.01.2011 14:56:30 (9 years ago)
Author:
sjm84
Message:

Discovered [DY]LD_LIBRARY_PATH is needed in the configure stage of Mac and Linux

Files:
1 modified

Legend:

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

    r23583 r23584  
    5858                    <arg value="export"/> 
    5959                    <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-minimal-${os.shell}${extension-x64}.tar.gz"/> 
    60                     <arg value="${basedir}/compiled/ext/gnome-lib-${os.shell}.tar.gz"/> 
     60                    <arg value="${basedir}/compiled/ext/gnome-lib-minimal-${os.shell}.tar.gz"/> 
    6161                </exec> 
    6262 
    6363                <exec executable="tar" dir="${basedir}/compiled/ext"> 
    6464                    <arg value="xvzf"/> 
    65                     <arg value="gnome-lib-${os.shell}.tar.gz"/> 
     65                    <arg value="gnome-lib-minimal-${os.shell}.tar.gz"/> 
    6666                </exec> 
    6767 
     
    176176                <arg line="LDFLAGS=&quot;-static -L${basedir}/compiled/ext/gnome-lib-minimal/linux/lib&quot;"/> 
    177177                <arg line="PKG_CONFIG_PATH=&quot;${basedir}/compiled/ext/gnome-lib-minimal/linux/lib/pkgconfig&quot;"/> 
     178                <arg line="LD_LIBRARY_PATH=&quot;${basedir}/compiled/ext/gnome-lib-minimal/linux/lib&quot;"/> 
    178179            </exec> 
    179180 
     
    193194                <arg line="CXXFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib-minimal/darwin/include&quot;"/> 
    194195                <arg line="LDFLAGS=&quot;-L${basedir}/compiled/ext/gnome-lib-minimal/darwin/lib&quot;"/> 
     196                <arg line="PKG_CONFIG_PATH=&quot;${basedir}/compiled/ext/gnome-lib-minimal/darwin/lib/pkgconfig&quot;"/> 
     197                <arg line="DYLD_LIBRARY_PATH=&quot;${basedir}/compiled/ext/gnome-lib-minimal/darwin/lib&quot;"/> 
    195198            </exec> 
    196199 
     
    213216            <!-- make --> 
    214217            <exec dir="${basedir}/compiled" executable="make" failonerror="true"> 
    215                 <arg line="${libpathvar}=&quot;${basedir}/compiled/ext/gnome-lib-minimal/linux/lib&quot;"/> 
     218                <arg line="${libpathvar}=&quot;${basedir}/compiled/ext/gnome-lib-minimal/${os.shell}/lib&quot;"/> 
    216219            </exec> 
    217220