From: jbasney <jbasney>
Date: Fri, 16 Feb 2007 21:48:05 +0000 (+0000)
Subject: build zlib-1.2.3 ourselves
X-Git-Tag: OPENSSH_4_5P1_20070218~23
X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/commitdiff_plain/753b352b1505c426c4aa609417aed1b0ee2e8a07

build zlib-1.2.3 ourselves
---

diff --git a/nmi/cmdfile b/nmi/cmdfile
index 9c385f5..d781bab 100644
--- a/nmi/cmdfile
+++ b/nmi/cmdfile
@@ -3,10 +3,10 @@ component = GSI-OpenSSH
 component_version = 3.9
 description = pre-release test builds
 run_type = build
-inputs = gsissh-src.ftp, gsissh-nmi.cvs
+inputs = gsissh-src.ftp, gsissh-nmi.cvs, zlib-src.ftp
 remote_task = nmi/testscript
 platforms = ia64_sles_8, ia64_sles_9, ppc_aix_5.2, ppc_macos_10.4, sun4u_sol_5.9, x86_64_rhas_3, x86_64_rhas_4, x86_deb_3.1, x86_fc_3, x86_fc_4, x86_rhas_3, x86_rhas_4
-prereqs = zlib-1.2.3
+#prereqs = zlib-1.2.3
 prereqs_ppc_macos_10.4 = curl-7.15.1
 prereqs_sun4u_sol_5.9 = curl-7.15.1, tar-1.14, patch-2.5.4, m4-1.4.1, flex-2.5.4a, make-3.80, byacc-1.9, gzip-1.2.4, gcc-2.95.3, coreutils-5.2.1, perl-5.8.5
 prereqs_ppc_aix_5.2 = tar-1.14, make-3.80, flex-2.5.4a, perl-5.8.5, bison-1.25, vac-6, vacpp-6
diff --git a/nmi/testscript b/nmi/testscript
index 98da630..99d65bd 100755
--- a/nmi/testscript
+++ b/nmi/testscript
@@ -8,6 +8,7 @@ else
   GT_INSTALLER_URL=http://www.globus.org/ftppub/gt4/4.0/4.0.3/installers/bin/$GT_INSTALLER
 fi
 GLOBUS_LOCATION=$_CONDOR_SCRATCH_DIR/globus
+ZLIB_LOCATION=$_CONDOR_SCRATCH_DIR/zlib
 LOGNAME=$USER
 X509_CERT_DIR=$GLOBUS_LOCATION/share/certificates
 export GLOBUS_LOCATION LOGNAME X509_CERT_DIR
@@ -36,13 +37,21 @@ cd gt*-installer
 ./configure --prefix=$GLOBUS_LOCATION --with-buildopts="-verbose"
 make gsi-openssh install
 . $GLOBUS_LOCATION/etc/globus-user-env.sh
+cd ..
+echo ==================================================
+echo Building zlib-1.2.3...
+ls -l
+tar xvfz zlib-1.2.3.tar.gz
+cd zlib-1.2.3
+./configure --prefix=$ZLIB_LOCATION
+make
+make install
 echo ==================================================
 flavor=`gpt-query -name=gsi_openssh | perl -n -e 'if (/gsi_openssh-(.*)-pgm/){print "$1\n";}'|head -1`
 echo GPT flavor is $flavor.  Installing globus_core.
 gpt-build -nosrc $flavor
 echo ==================================================
 echo Building GSI-OpenSSH...
-cd ..
 gpt-build -force -verbose gsi_openssh_bundle-*.tar.gz $flavor \
-  GSI_OPENSSH_GPTMACRO="--with-zlib=/prereq/zlib-1.2.3"
+  GSI_OPENSSH_GPTMACRO="--with-zlib=$ZLIB_LOCATION"
 ) 2>&1 # we want stdout & stderr mixed in the output file