From 5b45586ea81dc5d97a39d6ffa62a612a17057d6d Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Mon, 4 Sep 2006 21:08:13 +0000
Subject: EncapPackages: Force OpenSSL to always use gcc. This should also get
 rid of the sparcv9 bug.

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2192 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/BUGS                                       | 4 ----
 encap/src/encap-profiles/bcfg2-openssl-0.9.8b.ep | 9 +++++++++
 2 files changed, 9 insertions(+), 4 deletions(-)
 delete mode 100644 encap/BUGS

(limited to 'encap')

diff --git a/encap/BUGS b/encap/BUGS
deleted file mode 100644
index 156d22a2b..000000000
--- a/encap/BUGS
+++ /dev/null
@@ -1,4 +0,0 @@
- * Building of OpenSSL fails on Solaris 10 on sparcv9 in "gmake test" with:
-   "gmake[1]: *** [test_evp] Error 9"; until this is fixed, the encap packages
-   won't work on that platform. Hints from people who admin Solaris are 
-   welcomed.
diff --git a/encap/src/encap-profiles/bcfg2-openssl-0.9.8b.ep b/encap/src/encap-profiles/bcfg2-openssl-0.9.8b.ep
index 6a5d92659..740e9c5bd 100644
--- a/encap/src/encap-profiles/bcfg2-openssl-0.9.8b.ep
+++ b/encap/src/encap-profiles/bcfg2-openssl-0.9.8b.ep
@@ -64,6 +64,11 @@ url="http://www.pobox.com/users/dclark/mirror/openssl/openssl-0.9.8b.tar.gz
 >
 
 <configure>
+if [ -f config.orig ]; then cp config.orig config; fi
+cat config | sed s:CC\=ccc:CC\=gcc:g | sed s:CC\=cc:CC\=gcc:g > config.bcfg2
+mv config config.orig
+cp config.bcfg2 config
+chmod 755 config
 ./config \
 	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
 	zlib-dynamic shared \
@@ -78,6 +83,10 @@ url="http://www.pobox.com/users/dclark/mirror/openssl/openssl-0.9.8b.tar.gz
 </source>
 
 <prepackage>
+# Put source back to pristine state
+rm ${builddir}/config
+cp ${builddir}/config.orig ${builddir}/config
+chmod 755 ${builddir}/config
 # Make man pages available from /usr/local/lib/bcfg2/man
 mv lib/bcfg2/ssl/man lib/bcfg2/
 # Other stuff...
-- 
cgit v1.2.3-1-g7c22