Changeset 36342 for main/trunk

Timestamp:

2022-07-29T11:47:48+12:00 (21 months ago)

Author:

kjdon

Message:

some mods for 32 bit

File:

• main/trunk/gs-release-builder/envi/etc/tasks/snapshot/environment.pl (modified) (2 diffs)

main/trunk/gs-release-builder/envi/etc/tasks/snapshot/environment.pl

@@ -1 +1 @@
 $os_name = $^O;
+$bitness = 64; # change to 32 on 32 bit linux
 
 if ($os_name =~ "linux") {
@@ -16 +17 @@
     $ENV{'PATH'} = "$ENV{'JAVA_HOME'}/bin:$ENV{'PATH'}";
 
-    # not sure what jli stuff is for
-    # TODO - test for bitness and use i386 instead of amd64 for 32 bit  version
-     $ENV{'LD_LIBRARY_PATH'} = "$ENV{'JAVA_HOME'}/jre/lib/amd64/jli:$home_dir/packages/subversion/linux/lib:$ENV{'LD_LIBRARY_PATH'}";
-     
-     
+    if ($bitness == 32) {
+    print "32 bit\n";
+    $ENV{'LD_LIBRARY_PATH'} = "$ENV{'JAVA_HOME'}/jre/lib/i386/jli:$home_dir/packages/subversion/linux/lib:$ENV{'LD_LIBRARY_PATH'}";
+    # to force openssl to be 32 bit (otherwise it will test the machine, and be 64 bit)
+    $ENV{'GS_OPENSSL_HOST'} = "linux-generic32";
+    } else {
+    print "64bit\n";
+    $ENV{'LD_LIBRARY_PATH'} = "$ENV{'JAVA_HOME'}/jre/lib/amd64/jli:$home_dir/packages/subversion/linux/lib:$ENV{'LD_LIBRARY_PATH'}";
+    }
      #PYTHON - 2.7+ needed to compile gnome-lib's glib-2.54.x
      $ENV{'PATH'} = "$home_dir/packages/python2.7/bin:$ENV{'PATH'}";