summaryrefslogtreecommitdiffstats
path: root/encap
diff options
context:
space:
mode:
authorDaniel Joseph Barnhart Clark <dclark@pobox.com>2006-09-04 21:08:13 +0000
committerDaniel Joseph Barnhart Clark <dclark@pobox.com>2006-09-04 21:08:13 +0000
commit5b45586ea81dc5d97a39d6ffa62a612a17057d6d (patch)
treed7bb0defef0a0cd0059ab8869d4938f132fb3d92 /encap
parent4c983c6ea904b257f1cd3b1da42b87b04e8d23b0 (diff)
downloadbcfg2-5b45586ea81dc5d97a39d6ffa62a612a17057d6d.tar.gz
bcfg2-5b45586ea81dc5d97a39d6ffa62a612a17057d6d.tar.bz2
bcfg2-5b45586ea81dc5d97a39d6ffa62a612a17057d6d.zip
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
Diffstat (limited to 'encap')
-rw-r--r--encap/BUGS4
-rw-r--r--encap/src/encap-profiles/bcfg2-openssl-0.9.8b.ep9
2 files changed, 9 insertions, 4 deletions
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...