Browse files

remove dependency on no-longer-available Sun Studio

  • Loading branch information...
1 parent b1431f3 commit 52adf862373abbba99218495686fdfbf67e21f00 @JohnSonnenschein JohnSonnenschein committed Feb 15, 2012
Showing with 3 additions and 17 deletions.
  1. +2 −15 configure
  2. +1 −2 sample.configure.smartos
View
17 configure
@@ -83,24 +83,11 @@ if [ "${HAVE_PKG}" == "true" ]; then
fi
echo "==> Checking for /opt/SUNWspro/bin/cc..."
-echo " +--> Ensuring SUNWspro (12.1-patched) installed in /opt/SUNWspro/sunstudio12.1..."
-if [ ! -f "/opt/SUNWspro/sunstudio12.1/prod/bin/cc" ]; then
- if [ ! -z "${SUNW_SPRO12u1_URL}" ]; then
- (${ROOTCMD} mkdir -p /opt/SUNWspro \
- && cd /opt/SUNWspro \
- && curl -k ${SUNW_SPRO12u1_URL} \
- | ${ROOTCMD} gtar -zxf -)
- else
- echo "FATAL: unable to download sunstudio12u1, no URL is set. Please set SUNW_SPRO12u1_URL in configure.*"
- exit 1
- fi
-fi
-echo " +--> Ensuring SUNWspro (12-patched) installed in /opt/SUNWspro..."
+echo " +--> Ensuring SUNWspro installed in /opt/SUNWspro..."
if [ ! -f "/opt/SUNWspro/prod/bin/cc" ]; then
if [ ! -z "${SUNW_SPRO12_URL}" ]; then
- (${ROOTCMD} mkdir -p /opt/SUNWspro \
- && cd /opt/SUNWspro \
+ (cd /opt/ \
&& curl -k "${SUNW_SPRO12_URL}" \
| ${ROOTCMD} gtar -jxf -)
else
View
3 sample.configure.smartos
@@ -8,8 +8,7 @@ mkdir -p projects/local
PUBLISHER="joyent"
RELEASE_VER="smartos_20120112"
-SUNW_SPRO12_URL=""
-SUNW_SPRO12u1_URL=""
+SUNW_SPRO12_URL="https://download.joyent.com/pub/build/SunStudio.tar.bz2"
ON_CLOSED_BINS_URL="http://dlc.sun.com/osol/on/downloads/20100817/on-closed-bins.i386.tar.bz2"
ON_CLOSED_BINS_ND_URL="http://dlc.sun.com/osol/on/downloads/20100817/on-closed-bins-nd.i386.tar.bz2"
GET_ILLUMOS="(git clone http://github.com/joyent/illumos-joyent illumos)"

1 comment on commit 52adf86

@MerlinDMC

the tarball available at https://download.joyent.com/pub/build/SunStudio.tar.bz2 is compressed by bzip2 twice.
because of that the "gtar -jxf -" fails during configure

Please sign in to comment.