Changeset 36342


Ignore:
Timestamp:
2022-07-29T11:47:48+12:00 (2 weeks ago)
Author:
kjdon
Message:

some mods for 32 bit

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/gs-release-builder/envi/etc/tasks/snapshot/environment.pl

    r36285 r36342  
    11$os_name = $^O;
     2$bitness = 64; # change to 32 on 32 bit linux
    23
    34if ($os_name =~ "linux") {
     
    1617    $ENV{'PATH'} = "$ENV{'JAVA_HOME'}/bin:$ENV{'PATH'}";
    1718
    18     # not sure what jli stuff is for
    19     # TODO - test for bitness and use i386 instead of amd64 for 32 bit  version
    20      $ENV{'LD_LIBRARY_PATH'} = "$ENV{'JAVA_HOME'}/jre/lib/amd64/jli:$home_dir/packages/subversion/linux/lib:$ENV{'LD_LIBRARY_PATH'}";
    21      
    22      
     19    if ($bitness == 32) {
     20    print "32 bit\n";
     21    $ENV{'LD_LIBRARY_PATH'} = "$ENV{'JAVA_HOME'}/jre/lib/i386/jli:$home_dir/packages/subversion/linux/lib:$ENV{'LD_LIBRARY_PATH'}";
     22    # to force openssl to be 32 bit (otherwise it will test the machine, and be 64 bit)
     23    $ENV{'GS_OPENSSL_HOST'} = "linux-generic32";
     24    } else {
     25    print "64bit\n";
     26    $ENV{'LD_LIBRARY_PATH'} = "$ENV{'JAVA_HOME'}/jre/lib/amd64/jli:$home_dir/packages/subversion/linux/lib:$ENV{'LD_LIBRARY_PATH'}";
     27    }
    2328     #PYTHON - 2.7+ needed to compile gnome-lib's glib-2.54.x
    2429     $ENV{'PATH'} = "$home_dir/packages/python2.7/bin:$ENV{'PATH'}";
Note: See TracChangeset for help on using the changeset viewer.