From 1372f7334aaafe67857c25ab9db98ef2c6942f97 Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org>
Date: Thu, 22 Jun 2000 08:14:54 +0000
Subject: [PATCH] Prepend additional paths to LD_LIBRARY_PATH rather than
overriding it. Pass ConfigureEnvArgs to make.
---
tools/tinderbox/build-seamonkey-util.pl | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/tools/tinderbox/build-seamonkey-util.pl b/tools/tinderbox/build-seamonkey-util.pl
index ba7b9bf8fc083..da66ad8fc56ec 100644
--- a/tools/tinderbox/build-seamonkey-util.pl
+++ b/tools/tinderbox/build-seamonkey-util.pl
@@ -1,3 +1,20 @@
+From - Wed Jun 21 15:13:30 2000
+Return-Path: <cltbld@netscape.com>
+Delivered-To: seawood.org-cls@seawood.org
+Received: (qmail 21070 invoked from network); 21 Jun 2000 21:20:45 -0000
+Received: from h-205-217-237-46.netscape.com (HELO netscape.com) (205.217.237.46)
+ by mail.aureate.com with SMTP; 21 Jun 2000 21:20:49 -0000
+Received: from nebiros.mcom.com (nebiros.mcom.com [208.12.36.112])
+ by netscape.com (8.10.0/8.10.0) with ESMTP id e5LLCog28359
+ for <cls@seawood.org>; Wed, 21 Jun 2000 14:12:50 -0700 (PDT)
+Received: (from cltbld@localhost)
+ by nebiros.mcom.com (8.9.3+Sun/8.9.1) id OAA28538
+ for cls@seawood.org; Wed, 21 Jun 2000 14:20:25 -0700 (PDT)
+Date: Wed, 21 Jun 2000 14:20:25 -0700 (PDT)
+From: client build account <cltbld@netscape.com>
+Message-Id: <200006212120.OAA28538@nebiros.mcom.com>
+To: cls@seawood.org
+
#!/usr/bin/perl
#
# Requires: tinder-defaults.pl
@@ -18,7 +35,7 @@ use POSIX qw(sys_wait_h strftime);
use Cwd;
use File::Basename; # for basename();
use Config; # for $Config{sig_name} and $Config{sig_num}
-$::UtilsVersion = '$Revision: 1.19 $ ';
+$::UtilsVersion = '$Revision: 1.20 $ ';
package TinderUtils;
@@ -260,8 +277,8 @@ sub LoadConfig {
sub SetupEnv {
umask 0;
my $topsrcdir = "$Settings::BaseDir/$Settings::DirName/mozilla";
- $ENV{LD_LIBRARY_PATH} = "$topsrcdir/${Settings::ObjDir}/dist/bin"
- . ":/usr/lib/png:/usr/local/lib";
+ $ENV{LD_LIBRARY_PATH} = "$topsrcdir/${Settings::ObjDir}/dist/bin:"
+ . "$ENV{LD_LIBRARY_PATH}";
$ENV{MOZILLA_FIVE_HOME} = "$topsrcdir/${Settings::ObjDir}/dist/bin";
$ENV{DISPLAY} = $Settings::DisplayServer;
$ENV{MOZCONFIG} = "$Settings::BaseDir/$Settings::MozConfigFileName"
@@ -554,7 +571,7 @@ sub BuildIt {
unless ($Settings::TestOnly) { # Do not build if testing smoke tests.
DeleteBinary($full_binary_name);
- my $make = "$Settings::Make -f client.mk";
+ my $make = "$Settings::Make -f client.mk $Settings::MakeOverrides CONFIGURE_ENV_ARGS='$Settings::ConfigureEnvArgs'";
my $targets = $TreeSpecific::checkout_target;
$targets = $TreeSpecific::checkout_clobber_target unless $Settings::BuildDepend;
mkdir $Settings::ObjDir, 0777 if ($Settings::ObjDir && ! -e $Settings::ObjDir);
--
GitLab