From 14063a8f707a5f8d715f0aab196615915c7ecb83 Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Thu, 12 Jul 2007 17:07:33 +0000
Subject: Changes for Solaris 9 compile

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3436 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep |  6 ++--
 encap/src/encap-profiles/bcfg2-python-2.4.4.ep  | 22 ++++++------
 encap/src/encap-profiles/bcfg2-swig-1.3.31.ep   | 46 ++++++++++++-------------
 3 files changed, 37 insertions(+), 37 deletions(-)

(limited to 'encap')

diff --git a/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep b/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
index 21762d33f..a7ad68ffa 100644
--- a/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
+++ b/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
@@ -3,8 +3,8 @@
 <!-- $Id$ -->
 
 <encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-m2crypto-0.17"
+  profile_ver="1.0"
+  pkgspec="bcfg2-m2crypto-0.17"
 >
 
 <prereq package="m4-1.4.4" />
@@ -47,7 +47,7 @@ PLATFORM_IF_MATCH(linux)
 PLATFORM_ELSE_IF_MATCH(aix)
         value="-L/usr/local/lib/bcfg2/lib -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/lib"
 PLATFORM_ELSE_IF_MATCH(solaris)
-        value="-L/usr/local/lib/bcfg2/lib -R/usr/local/lib/bcfg2/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib"
+        value="-L/usr/local/lib/bcfg2/lib -L/usr/local/lib -R/usr/local/lib/bcfg2/lib:/usr/local/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/local/lib:/usr/lib"
 PLATFORM_ELSE
 PLATFORM_ENDIF
         type="set"
diff --git a/encap/src/encap-profiles/bcfg2-python-2.4.4.ep b/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
index bb7244bbb..018841e5e 100644
--- a/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
+++ b/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
@@ -3,8 +3,8 @@
 <!-- $Id$ -->
 
 <encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-python-2.4.4"
+  profile_ver="1.0"
+  pkgspec="bcfg2-python-2.4.4"
 >
 
 <prereq package="m4-1.4.4" />
@@ -46,7 +46,7 @@ PLATFORM_IF_MATCH(linux)
 PLATFORM_ELSE_IF_MATCH(aix)
         value="-L/usr/local/lib/bcfg2/lib -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/lib"
 PLATFORM_ELSE_IF_MATCH(solaris)
-        value="-L/usr/local/lib/bcfg2/lib -R/usr/local/lib/bcfg2/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib"
+        value="-L/usr/local/lib/bcfg2/lib -L/usr/local/lib -R/usr/local/lib/bcfg2/lib:/usr/local/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/local/lib:/usr/lib"
 PLATFORM_ELSE
 PLATFORM_ENDIF
         type="set"
@@ -87,7 +87,7 @@ url="http://encapsrcdist/mirror/python/Python-2.4.4.tgz
 -        exts.append( Extension('_locale', ['_localemodule.c'],
 -                               libraries=locale_libs,
 -                               extra_link_args=locale_extra_link_args) )
- 
+
          # Modules with some UNIX dependencies -- on by default:
          # (If you have a really backward UNIX, select and socket may not be
 ]]></patch>
@@ -96,7 +96,7 @@ url="http://encapsrcdist/mirror/python/Python-2.4.4.tgz
 --- site.py	2007-06-21 22:26:29.000000000 -0400
 +++ site.py	2007-06-21 22:26:55.000000000 -0400
 @@ -170,7 +170,7 @@
- 
+
  def addsitepackages(known_paths):
      """Add site-packages (and possibly site-python) to sys.path"""
 -    prefixes = [sys.prefix]
@@ -115,15 +115,15 @@ cat setup.py \
 mv setup.py setup.py.orig
 cp setup.py.bcfg2 setup.py
 ./configure \
-	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
+  --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
 PLATFORM_IF_MATCH(linux)
 PLATFORM_ELSE
-	--with-gcc \
+  --with-gcc \
 PLATFORM_ENDIF
-	--enable-shared=no \
-	--disable-ipv6 \
-	--without-cxx \
-	--without-libintl
+  --enable-shared=no \
+  --disable-ipv6 \
+  --without-cxx \
+  --without-libintl
 </configure>
 
 </source>
diff --git a/encap/src/encap-profiles/bcfg2-swig-1.3.31.ep b/encap/src/encap-profiles/bcfg2-swig-1.3.31.ep
index 8d11b63b7..77fe058e0 100644
--- a/encap/src/encap-profiles/bcfg2-swig-1.3.31.ep
+++ b/encap/src/encap-profiles/bcfg2-swig-1.3.31.ep
@@ -3,8 +3,8 @@
 <!-- $Id$ -->
 
 <encap_profile
-	profile_ver="1.0"
-	pkgspec="bcfg2-swig-1.3.31"
+  profile_ver="1.0"
+  pkgspec="bcfg2-swig-1.3.31"
 >
 
 <prereq package="m4-1.4.4" />
@@ -49,7 +49,7 @@ PLATFORM_IF_MATCH(linux)
 PLATFORM_ELSE_IF_MATCH(aix)
         value="-L/usr/local/lib/bcfg2/lib -Wl,-blibpath:/usr/local/lib/bcfg2/lib:/usr/lib -Wl,-brtl"
 PLATFORM_ELSE_IF_MATCH(solaris)
-        value="-L/usr/local/lib/bcfg2/lib -R/usr/local/lib/bcfg2/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/lib"
+        value="-L/usr/local/lib/bcfg2/lib -L/usr/local/lib -R/usr/local/lib/bcfg2/lib:/usr/local/lib:/usr/lib -YP,/usr/local/lib/bcfg2/lib:/usr/local/lib:/usr/lib"
 PLATFORM_ELSE
 PLATFORM_ENDIF
         type="set"
@@ -78,25 +78,25 @@ url="http://encapsrcdist/mirror/swig/swig-1.3.31.tar.gz
 
 <configure>
 ./configure \
-	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
-	--without-x \
-	--without-tcl \
-	--with-python=/usr/local/lib/bcfg2/bin/python \
-	--without-perl5 \
-	--without-java \
-	--without-gcj \
-	--without-guile \
-	--without-mzscheme \
-	--without-ruby \
-	--without-php4 \
-	--without-ocaml \
-	--without-pike \
-	--without-chicken \
-	--without-csharp \
-	--without-lua \
-	--without-allegrocl \
-	--without-clisp \
-	--without-r
+  --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
+  --without-x \
+  --without-tcl \
+  --with-python=/usr/local/lib/bcfg2/bin/python \
+  --without-perl5 \
+  --without-java \
+  --without-gcj \
+  --without-guile \
+  --without-mzscheme \
+  --without-ruby \
+  --without-php4 \
+  --without-ocaml \
+  --without-pike \
+  --without-chicken \
+  --without-csharp \
+  --without-lua \
+  --without-allegrocl \
+  --without-clisp \
+  --without-r
 </configure>
 
 </source>
@@ -109,7 +109,7 @@ touch var/encap/${ENCAP_PKGNAME}
 </prepackage>
 
 <encapinfo>
-description swig - generate scripting interfaces to C/C++ code 
+description swig - generate scripting interfaces to C/C++ code
 </encapinfo>
 
 </encap_profile>
-- 
cgit v1.2.3-1-g7c22