]> git.openfabrics.org - ~aditr/ofed_scripts.git/commitdiff
install.pl: Add environment for 32-bit libraries installation on 64-bit platforms.
authorVladimir Sokolovsky <vlad@mellanox.co.il>
Tue, 6 Nov 2007 13:25:53 +0000 (15:25 +0200)
committerVladimir Sokolovsky <vlad@mellanox.co.il>
Tue, 6 Nov 2007 14:26:26 +0000 (16:26 +0200)
Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.co.il>
install.pl

index f08425ab8fa9c3f4042c4209d1c390506ff76c30..0ef868cfc78d9379fa7b3fccb75fa892156465ba 100755 (executable)
@@ -2446,7 +2446,6 @@ sub build_rpm
     my $cxxflags;
     my $fflags;
     my $ldlibs;
-
     my $parent = $packages_info{$name}{'parent'};
     print "Build $name RPM\n" if ($verbose);
 
@@ -2823,7 +2822,36 @@ sub build_rpm
 
     if ($build32 and $packages_info{$name}{'install32'} and 
         not $packages_info{$name}{'rpm_exist32'}) {
-        $cmd = "$pref_env rpmbuild --rebuild --define '_topdir $TOPDIR'";
+
+        my $pref_env32;
+        my $ldflags32;
+        my $cflags32;
+        my $cppflags32;
+        my $cxxflags32;
+        my $fflags32;
+        my $ldlibs32;
+
+        $ldflags32    .= " -m32 -g -O2 -L/usr/lib";
+        $cflags32     .= " -m32 -g -O2";
+        $cppflags32   .= " -m32 -g -O2";
+        $cxxflags32   .= " -m32 -g -O2";
+        $fflags32     .= " -m32 -g -O2";
+        $ldlibs32     .= " -m32 -g -O2 -L/usr/lib";
+
+        if ($prefix ne $default_prefix) {
+            $ldflags32 .= " -L$prefix/lib";
+            $cflags32 .= " -I$prefix/include";
+            $cppflags32 .= " -I$prefix/include";
+        }
+
+        $pref_env32 .= " LDFLAGS='$ldflags32'";
+        $pref_env32 .= " CFLAGS='$cflags32'";
+        $pref_env32 .= " CPPFLAGS='$cppflags32'";
+        $pref_env32 .= " CXXFLAGS='$cxxflags32'";
+        $pref_env32 .= " FFLAGS='$fflags32'";
+        $pref_env32 .= " LDLIBS='$ldlibs32'";
+
+        $cmd = "$pref_env32 rpmbuild --rebuild --define '_topdir $TOPDIR'";
         $cmd .= " --target $target_cpu32";
         $cmd .= " --define '_prefix $prefix'";
         $cmd .= " --define '_exec_prefix $prefix'";