From 72a19e13bd6c805bc0920a1bb53f309242ca3eda Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Mon, 19 Feb 2007 07:32:06 +0000
Subject: EncapPackages: Final changes for Etch / x86_64

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2844 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/src/encap-profiles/Makefile                | 1 +
 encap/src/encap-profiles/bcfg2-glib-2.12.9.ep    | 3 +--
 encap/src/encap-profiles/bcfg2-libxslt-1.1.20.ep | 5 -----
 encap/src/encap-profiles/bcfg2-zlib-1.2.3.ep     | 7 +++++++
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'encap/src')

diff --git a/encap/src/encap-profiles/Makefile b/encap/src/encap-profiles/Makefile
index abdbf7d91..722557964 100644
--- a/encap/src/encap-profiles/Makefile
+++ b/encap/src/encap-profiles/Makefile
@@ -60,6 +60,7 @@ OS ?= linux_debian_sarge
 endif
 
 ifeq ($(DISTRO),Debian GNU/Linux 4.0 \n \l)
+sources_ep += $(sources_server)
 BCFG2_PYTHON_APT = bcfg2-python-apt-0.6.19
 OS ?= linux_debian_etch
 endif
diff --git a/encap/src/encap-profiles/bcfg2-glib-2.12.9.ep b/encap/src/encap-profiles/bcfg2-glib-2.12.9.ep
index c57b9518c..85c2c9330 100644
--- a/encap/src/encap-profiles/bcfg2-glib-2.12.9.ep
+++ b/encap/src/encap-profiles/bcfg2-glib-2.12.9.ep
@@ -66,8 +66,7 @@ url="http://encapsrcdist/mirror/glib/glib-2.12.9.tar.gz
 
 <configure>
 ./configure \
-	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
-	--with-libiconv=gnu
+	--prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2"
 </configure>
 
 </source>
diff --git a/encap/src/encap-profiles/bcfg2-libxslt-1.1.20.ep b/encap/src/encap-profiles/bcfg2-libxslt-1.1.20.ep
index 80a3a0f2c..bff46e550 100644
--- a/encap/src/encap-profiles/bcfg2-libxslt-1.1.20.ep
+++ b/encap/src/encap-profiles/bcfg2-libxslt-1.1.20.ep
@@ -83,11 +83,6 @@ PLATFORM_ENDIF
 </source>
 
 <prepackage type="set">
-# Remove doc - it's big # not any more - server only
-#if [ -d lib/bcfg2/share/doc ]; then rm -rf lib/bcfg2/share/doc; fi
-# Put python stuff in the right place
-mv lib/bcfg2/lib/lib/python2.4 lib/bcfg2/lib
-rmdir lib/bcfg2/lib/lib
 # Make "this encap is installed" sentinal file available in /usr/local/var/encap
 test -d var || mkdir var
 test -d var/encap || mkdir var/encap
diff --git a/encap/src/encap-profiles/bcfg2-zlib-1.2.3.ep b/encap/src/encap-profiles/bcfg2-zlib-1.2.3.ep
index c5de03977..cdcddd297 100644
--- a/encap/src/encap-profiles/bcfg2-zlib-1.2.3.ep
+++ b/encap/src/encap-profiles/bcfg2-zlib-1.2.3.ep
@@ -58,6 +58,13 @@ PLATFORM_IF_MATCH(solaris)
         variable="CFLAGS"
         type="unset"
 />
+PLATFORM_ELSE_IF_MATCH(linux)
+<environment
+        variable="CFLAGS"
+        value=" -fPIC"
+        type="append"
+/>
+PLATFORM_ELSE
 PLATFORM_ENDIF
 
 <source
-- 
cgit v1.2.3-1-g7c22