Changeset 30758

Show
Ignore:
Timestamp:
26.08.2016 13:11:08 (3 years ago)
Author:
davidb
Message:

Correcting previous commit. Experiment to see if this helps the release on El Capitan compile. The issue we are looking at is that setting DYLD_LIBRARY_PATH at this point leads to a problem with java, because it now sees the libiconv that gnome-lib-minimal has, which turns out to be incompatible with JDK 1.7_79

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r30757 r30758  
    390390    </else> 
    391391    </if> 
    392 <!-- 
     392 
    393393    <if><bool><equals arg1="${os.bin.dir}" arg2="darwin"/></bool> 
    394         <if><bool><isset property="env.DYLD_LIBRARY_PATH"/></bool> 
     394        <!--<if><bool><isset property="env.DYLD_LIBRARY_PATH"/></bool> 
    395395            <property name="ldlpath.arg" value="DYLD_LIBRARY_PATH=&quot;${gnome-lib-dir}/lib:${env.DYLD_LIBRARY_PATH}&quot;"/> 
    396396        <else> 
     
    398398        </else> 
    399399        </if> 
     400          --> 
     401        <property name="ldlpath.arg" value="DYLD_LIBRARY_PATH=&quot;${env.DYLD_LIBRARY_PATH}&quot;"/> 
    400402    <else> 
    401         <if><bool><isset property="env.LD_LIBRARY_PATH"/></bool> 
     403        <!--<if><bool><isset property="env.LD_LIBRARY_PATH"/></bool> 
    402404            <property name="ldlpath.arg" value="LD_LIBRARY_PATH=&quot;${gnome-lib-dir}/lib:${env.LD_LIBRARY_PATH}&quot;"/> 
    403405        <else> 
     
    405407        </else> 
    406408        </if> 
     409        --> 
     410        <property name="ldlpath.arg" value="LD_LIBRARY_PATH=&quot;${env.LD_LIBRARY_PATH}&quot;"/> 
    407411    </else> 
    408412    </if> 
    409 --> 
     413 
    410414 
    411415    <else>