Changeset 369:c570f2e52b32


Ignore:
Timestamp:
01/17/2015 04:32:31 PM (7 years ago)
Author:
fedorov@…
Branch:
default
Phase:
public
Message:

macx build system updates

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • macx_update_bin.sh

    r368 r369  
    1010#cp /usr/local/lib/gcc/4.9/libgcc_s.1.dylib $APPROOT/Libraries/
    1111
     12# update app
    1213install_name_tool -change /usr/local/lib/gcc/4.9/libstdc++.6.dylib @executable_path/../Libraries/libstdc++.6.dylib $APPBIN
    1314install_name_tool -change /usr/local/lib/gcc/4.9/libgomp.1.dylib @executable_path/../Libraries/libgomp.1.dylib $APPBIN
    1415install_name_tool -change /usr/local/lib/gcc/4.9/libgcc_s.1.dylib @executable_path/../Libraries/libgcc_s.1.dylib $APPBIN
    1516
     17# update libs - libstdc++.6.dylib
     18install_name_tool -id @executable_path/../Libraries/libstdc++.6.dylib $APPROOT/Libraries/libstdc++.6.dylib
     19install_name_tool -change /usr/local/lib/gcc/4.9/libgcc_s.1.dylib @executable_path/../Libraries/libgcc_s.1.dylib $APPROOT/Libraries/libstdc++.6.dylib
     20
     21# update libs - libgcc_s.1.dylib
     22install_name_tool -id @executable_path/../Libraries/libgcc_s.1.dylib $APPROOT/Libraries/libgcc_s.1.dylib
     23
     24# update libs - libgomp.1.dylib
     25install_name_tool -id @executable_path/../Libraries/libgomp.1.dylib $APPROOT/Libraries/libgomp.1.dylib
     26install_name_tool -change /usr/local/lib/gcc/4.9/libgcc_s.1.dylib @executable_path/../Libraries/libgcc_s.1.dylib $APPROOT/Libraries/libgomp.1.dylib
     27
     28
    1629# now let's check their status
    1730file $APPBIN
    1831otool -L $APPBIN
     32
     33otool -L $APPROOT/Libraries/libstdc++.6.dylib
     34otool -L $APPROOT/Libraries/libgomp.1.dylib
     35otool -L $APPROOT/Libraries/libgcc_s.1.dylib
  • testing/runtest.py

    r367 r369  
    5252    inst_ver = inst.split('.')
    5353    need_ver = needed.split('.')
    54     if int(inst_ver[0])<int(need_ver[0]) or int(inst_ver[1])<int(need_ver[1]):
    55         raise Exception('Imgcnv needs update! Has: '+inst+' Needs: '+needed)   
     54    if int(inst_ver[0])<int(need_ver[0]) or int(inst_ver[0])==int(need_ver[0]) and int(inst_ver[1])<int(need_ver[1]):
     55        raise Exception('Imgcnv needs update! Has: '+inst+' Needs: '+needed)
    5656
    5757def parse_imgcnv_info(s):
  • testing/test_jpeg.py

    r367 r369  
    5252    inst_ver = inst.split('.')
    5353    need_ver = needed.split('.')
    54     if int(inst_ver[0])<int(need_ver[0]) or int(inst_ver[1])<int(need_ver[1]):
     54    if int(inst_ver[0])<int(need_ver[0]) or int(inst_ver[0])==int(need_ver[0]) and int(inst_ver[1])<int(need_ver[1]):
    5555        raise Exception('Imgcnv needs update! Has: '+inst+' Needs: '+needed)   
    5656
Note: See TracChangeset for help on using the changeset viewer.