strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS native230

Browse source 
2009-02-25 18:14:03 +0100 is  r268465 : #i99629# rpm without LD_LIBRARY_PATH
This commit is contained in:
Oliver Bolte 2009-03-05 14:19:39 +00:00
parent f28cc6ae89
commit dbc028fb9b
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
solenv/bin/modules/installer/environment.pm
View file

@ -109,6 +109,8 @@ sub set_global_environment_variables
if ( $ENV{'MAX_LANG_LENGTH'} ) { $installer::globals::max_lang_length = $ENV{'MAX_LANG_LENGTH'}; }
if ( $ENV{'SOLAR_JAVA'} ) { $installer::globals::solarjavaset = 1; }
if ( $ENV{'RPM'} ) { $installer::globals::rpm = $ENV{'RPM'}; }
}
1;

7
solenv/bin/modules/installer/epmfile.pm
View file

@ -2466,14 +2466,15 @@ sub create_packages_without_epm
my $specfilename = $epmdir . $packagename . ".spec";
if (! -f $specfilename) { installer::exiter::exit_program("ERROR: Did not find file: $specfilename", "create_packages_without_epm"); }
my $rpmcommand = "rpm";
# my $rpmcommand = "rpm";
my $rpmcommand = $installer::globals::rpm;
my $rpmversion = determine_rpm_version();
if ( $rpmversion >= 4 ) { $rpmcommand = "rpmbuild"; }
# if ( $rpmversion >= 4 ) { $rpmcommand = "rpmbuild"; }
# saving globally for later usage
$installer::globals::rpmcommand = $rpmcommand;
$installer::globals::rpmquerycommand = "rpm"; # For queries "rpm" is used, not "rpmbuild"
$installer::globals::rpmquerycommand = "rpm"; # For queries "rpm" is used, not "rpmbuild" (for this call the LD_LIBRARY_PATH is not required!)
my $target = "";
if ( $installer::globals::compiler =~ /unxlngi/) { $target = "i586"; }

1
solenv/bin/modules/installer/globals.pm
View file

@ -162,6 +162,7 @@ BEGIN
$jdstemppathdefined = 0;
$packageversion = 1;
$packagerevision = 1;
$rpm = "";
$rpmcommand = "";
$rpmquerycommand = "";
$debian = "";

2
solenv/bin/modules/installer/parameter.pm
View file

@ -325,6 +325,8 @@ sub setglobalvariables
{
$installer::globals::islinuxx86_64rpmbuild = 1;
}
if ( $installer::globals::rpm eq "" ) { installer::exiter::exit_program("ERROR: Environment variable \"\$RPM\" has to be defined!", "setglobalvariables"); }
}
# Creating Debian packages ?