fix PIC and multilib on amd64

(Portage version: 2.1_pre3-r1)

6 files changed, 199 insertions, 17 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 9abc686f61f4..e045a1e2b239 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.9 2006/01/12 09:45:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.10 2006/01/12 14:30:41 hollow Exp $
+
+  12 Jan 2006; Benedikt Boehm <hollow@gentoo.org>
+  +files/vzctl-2.7.0-amd64.patch, +files/vzctl-2.7.0.24-pic.patch,
+  vzctl-2.7.0.24.ebuild, vzctl-2.7.0.25.ebuild:
+  fix PIC and multilib on amd64
 
 *vzctl-2.7.0.25 (12 Jan 2006)
 
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 8bad5016ac2e..cb0a536733ce 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 41b07dc46faecd7ee201d4b92fe740ac ChangeLog 1637
+MD5 625f0525dafb3c3445cbc2614d98fe41 ChangeLog 1835
 MD5 8aea757fe2bda9943ef7cfd6d6c51fe6 files/digest-vzctl-2.7.0.24 66
 MD5 fdc2f878f8d875de1d34854ef14675c9 files/digest-vzctl-2.7.0.25 66
 MD5 a2de79b189da1c2d3fd01fa2116bcea9 files/vz.initd 5465
+MD5 aa370ed43c03e3e93a36812d3eaf903a files/vzctl-2.7.0-amd64.patch 4434
 MD5 687eaa4427600a7a5edfc0b8b7f69480 files/vzctl-2.7.0-gentoo_conf_d.patch 3899
 MD5 48002ae17f4c768412ac70a33023d09d files/vzctl-2.7.0.23-gentoo_etc_vz.patch 7115
+MD5 d2877804e8c71fc4a8b5a9c97d2e79a7 files/vzctl-2.7.0.24-pic.patch 2419
 MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231
-MD5 7b754de87e8fbf054cc37f7e5f1a3e15 vzctl-2.7.0.24.ebuild 1589
-MD5 a9d56c145b68f69751c95f0cf9b72106 vzctl-2.7.0.25.ebuild 1591
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDxiVgmPFBzbX68WERAjpQAJ9ziqM9la1TsG7zzjoA37kKHK4ZZwCeM1TC
-YHxCvf0btk6dmJdC1z7LUX4=
-=ZNMc
------END PGP SIGNATURE-----
+MD5 0907e3c904bc6a9db934ddbb97f7e827 vzctl-2.7.0.24.ebuild 1731
+MD5 6ba06b320cbcd853ec2b9c4e254e5719 vzctl-2.7.0.25.ebuild 1678
diff --git a/sys-cluster/vzctl/files/vzctl-2.7.0-amd64.patch b/sys-cluster/vzctl/files/vzctl-2.7.0-amd64.patch
new file mode 100644
index 000000000000..bc8c482277a8
--- /dev/null
+++ b/sys-cluster/vzctl/files/vzctl-2.7.0-amd64.patch
@@ -0,0 +1,110 @@
+diff -NurpP vzctl-2.7.0-25/etc/ifup-venet vzctl-2.7.0-25-amd64/etc/ifup-venet
+--- vzctl-2.7.0-25/etc/ifup-venet	2005-12-29 16:57:05.000000000 +0300
++++ vzctl-2.7.0-25-amd64/etc/ifup-venet	2006-01-12 16:54:15.145147672 +0300
+@@ -21,7 +21,7 @@ vznet=$DEVICE
+ modvenet="vznetdev vznet"
+ 
+ . /etc/init.d/functions
+-. /usr/lib/vzctl/scripts/vps-functions
++. /usr/lib64/vzctl/scripts/vps-functions
+ . /etc/sysconfig/vz
+ 
+ veinfo="/proc/vz/veinfo"
+diff -NurpP vzctl-2.7.0-25/etc/vps-create vzctl-2.7.0-25-amd64/etc/vps-create
+--- vzctl-2.7.0-25/etc/vps-create	2005-12-29 16:57:05.000000000 +0300
++++ vzctl-2.7.0-25-amd64/etc/vps-create	2006-01-12 16:54:09.680978352 +0300
+@@ -16,7 +16,7 @@
+ #   VE_PRVT		- path to root of VPS private areas
+ #   PRIVATE_TEMPLATE	- path to private template used as a source for copying
+ 
+-. /usr/lib/vzctl/scripts/vps-functions
++. /usr/lib64/vzctl/scripts/vps-functions
+ 
+ vzcheckvar VE_PRVT PRIVATE_TEMPLATE
+ 
+diff -NurpP vzctl-2.7.0-25/etc/vps-net_add vzctl-2.7.0-25-amd64/etc/vps-net_add
+--- vzctl-2.7.0-25/etc/vps-net_add	2005-12-29 16:57:05.000000000 +0300
++++ vzctl-2.7.0-25-amd64/etc/vps-net_add	2006-01-12 16:54:09.681978200 +0300
+@@ -18,7 +18,7 @@
+ #                   (several addresses should be divided by space)
+ #   VE_STATE      - state of VPS; could be one of:
+ #                     starting | stopping | running | stopped
+-. /usr/lib/vzctl/scripts/vps-functions
++. /usr/lib64/vzctl/scripts/vps-functions
+ 
+ vzcheckvar VEID
+ 
+diff -NurpP vzctl-2.7.0-25/etc/vps-net_del vzctl-2.7.0-25-amd64/etc/vps-net_del
+--- vzctl-2.7.0-25/etc/vps-net_del	2005-12-29 16:57:05.000000000 +0300
++++ vzctl-2.7.0-25-amd64/etc/vps-net_del	2006-01-12 16:54:09.682978048 +0300
+@@ -18,7 +18,7 @@
+ #   VE_STATE      - state of VPS; could be one of:
+ #                     starting | stopping | running | stopped
+ 
+-. /usr/lib/vzctl/scripts/vps-functions
++. /usr/lib64/vzctl/scripts/vps-functions
+ 
+ vzcheckvar IP_ADDR VEID
+ 
+diff -NurpP vzctl-2.7.0-25/etc/vps-stop vzctl-2.7.0-25-amd64/etc/vps-stop
+--- vzctl-2.7.0-25/etc/vps-stop	2005-12-29 16:57:05.000000000 +0300
++++ vzctl-2.7.0-25-amd64/etc/vps-stop	2006-01-12 16:54:09.682978048 +0300
+@@ -15,7 +15,7 @@
+ #   VEID    - VPS id
+ #   IP_ADDR - VPS IP address(es) divided by spaces
+ 
+-. /usr/lib/vzctl/scripts/vps-functions
++. /usr/lib64/vzctl/scripts/vps-functions
+ 
+ # get list of network devices for vzarp
+ vzgetnetdev
+diff -NurpP vzctl-2.7.0-25/etc/vpsnetclean vzctl-2.7.0-25-amd64/etc/vpsnetclean
+--- vzctl-2.7.0-25/etc/vpsnetclean	2005-12-29 16:57:06.000000000 +0300
++++ vzctl-2.7.0-25-amd64/etc/vpsnetclean	2006-01-12 16:54:09.683977896 +0300
+@@ -9,7 +9,7 @@
+ # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ #
+ 
+-. /usr/lib/vzctl/scripts/vps-functions
++. /usr/lib64/vzctl/scripts/vps-functions
+ 
+ VEINFO=/proc/vz/veinfo
+ PROC_PROXY_TR=/proc/proxy/targets
+diff -NurpP vzctl-2.7.0-25/include/modules.h vzctl-2.7.0-25-amd64/include/modules.h
+--- vzctl-2.7.0-25/include/modules.h	2005-12-29 16:57:06.000000000 +0300
++++ vzctl-2.7.0-25-amd64/include/modules.h	2006-01-12 16:52:10.262132776 +0300
+@@ -17,7 +17,7 @@
+ #define	TYPE_CMD	0
+ #define	TYPE_CONF	1
+ 
+-#define MOD_DIR		"/usr/lib/vzctl/modules/"
++#define MOD_DIR		"/usr/lib64/vzctl/modules/"
+ 
+ #define MOD_INFO_SYM    "vz_get_mod_info"
+ 
+diff -NurpP vzctl-2.7.0-25/include/types.h vzctl-2.7.0-25-amd64/include/types.h
+--- vzctl-2.7.0-25/include/types.h	2005-12-29 16:57:06.000000000 +0300
++++ vzctl-2.7.0-25-amd64/include/types.h	2006-01-12 16:52:23.307149632 +0300
+@@ -13,8 +13,8 @@
+ 
+ #define GLOBAL_CFG              "/etc/conf.d/vz"
+ #define VPS_CONF_DIR            "/etc/vz/"
+-#define LIB_DIR			"/usr/lib/vzctl/lib/"
+-#define VPS_SCRIPTS_DIR         "/usr/lib/vzctl/scripts/"
++#define LIB_DIR			"/usr/lib64/vzctl/lib/"
++#define VPS_SCRIPTS_DIR         "/usr/lib64/vzctl/scripts/"
+ 
+ #define VPS_STOP		VPS_SCRIPTS_DIR "vps-stop"
+ #define VPS_NET_ADD		VPS_SCRIPTS_DIR "vps-net_add"
+diff -NurpP vzctl-2.7.0-25/src/Makefile vzctl-2.7.0-25-amd64/src/Makefile
+--- vzctl-2.7.0-25/src/Makefile	2005-12-29 16:57:06.000000000 +0300
++++ vzctl-2.7.0-25-amd64/src/Makefile	2006-01-12 16:51:56.383242688 +0300
+@@ -11,7 +11,7 @@
+      INSTALL = install
+       PREFIX = /usr
+      SBINDIR = $(PREFIX)/sbin
+-      LIBDIR = $(PREFIX)/lib/vzctl
++      LIBDIR = $(PREFIX)/lib64/vzctl
+     CACHEDIR = /vz/template/cache
+    GLBCONFIG = /etc/sysconfig/vz
+   VPSCONFDIR = /etc/sysconfig/vz-scripts
diff --git a/sys-cluster/vzctl/files/vzctl-2.7.0.24-pic.patch b/sys-cluster/vzctl/files/vzctl-2.7.0.24-pic.patch
new file mode 100644
index 000000000000..86601bb7ec32
--- /dev/null
+++ b/sys-cluster/vzctl/files/vzctl-2.7.0.24-pic.patch
@@ -0,0 +1,66 @@
+Index: src/Makefile
+===================================================================
+RCS file: /home/l/cvs/Virtuozzo/Packages/swsoft/vzctl/src/Attic/Makefile,v
+retrieving revision 1.1.2.44
+diff -u -r1.1.2.44 Makefile
+--- src/Makefile	24 Oct 2005 13:09:05 -0000	1.1.2.44
++++ src/Makefile	15 Nov 2005 12:37:19 -0000
+@@ -25,16 +25,17 @@
+ 
+ export LD_LIBRARY_PATH=.
+ CC = gcc
+-CFLAGS = -Wall -g2 
++CFLAGS = -Wall -g2
++SHAREDLIB_CFLAGS = -fPIC
+ VZKERNEL_HEADERS ?= /lib/modules/$(shell uname -r)/build/include
+ INC = -I ../include -I$(VZKERNEL_HEADERS)
+ ARCH=$(shell uname -i)
+ 
+-OBJ_libvzctl = lib/env.o lib/ub.o lib/net.o lib/logger.o lib/exec.o lib/cap.o \
+-	lib/cpu.o lib/res.o lib/util.o lib/dist.o lib/list.o lib/script.o \
+-	lib/dev.o lib/config.o lib/lock.o lib/quota.o lib/modules.o \
+-	lib/iptables.o lib/fs.o lib/create.o
+-OBJ_simfs=lib/fs_simfs.o
++OBJ_libvzctl = lib/env.lo lib/ub.lo lib/net.lo lib/logger.lo lib/exec.lo \
++	lib/cap.lo lib/cpu.lo lib/res.lo lib/util.lo lib/dist.lo lib/list.lo \
++	lib/script.lo lib/dev.lo lib/config.lo lib/lock.lo lib/quota.lo \
++	lib/modules.lo lib/iptables.lo lib/fs.lo lib/create.lo
++OBJ_simfs=lib/fs_simfs.lo
+ OBJ_vzctl = vzctl.o vzctl-actions.o modules.o enter.o
+ OBJ_vzlist = vzlist.o
+ OBJ_arp = arpsend.o
+@@ -42,7 +43,9 @@
+ OBJ_memcheck = vzmemcheck.o validate.o
+ OBJ_cfgvalidate = vzcfgvalidate.o validate.o
+ OBJ_calc = vzcalc.o
+-OBJ = $(OBJ_libvzctl) $(OBJ_vzctl) $(OBJ_vzlist) $(OBJ_split)
++OBJ = $(OBJ_vzctl) $(OBJ_vzlist) $(OBJ_arp) $(OBJ_split) $(OBJ_memcheck) \
++	$(OBJ_cfgvalidate) $(OBJ_calc)
++SOBJ = $(OBJ_libvzctl) $(OBJ_simfs)
+ LIB_vzctl = libvzctl.so.$(LIB_VER)
+ LIB_simfs = libvzctl-simfs.so.$(LIB_VER)
+ LIB_fs = libvzctl-fs.so
+@@ -69,6 +72,9 @@
+ %.o: %.c
+ 	$(CC) -c $(CFLAGS) $(INC) $< -o $@
+ 
++%.lo: %.c
++	$(CC) -c $(CFLAGS) $(SHAREDLIB_CFLAGS) $(INC) $< -o $@
++
+ $(LIB_simfs) : $(OBJ_simfs)
+ 	$(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(OBJ_simfs) -shared -o $@
+ 
+@@ -170,10 +176,10 @@
+ install: $(PROGS) inst-dirs install-lib inst-sbin inst-scripts \
+ 	inst-netscripts inst-configs inst-initd inst-cron
+ clean:
+-	rm -f *.o lib/*.o $(PROGS) $(LIB_vzctl) $(LIB_fs) $(LIB_simfs) .depend
++	rm -f *.o lib/*.lo $(PROGS) $(LIB_vzctl) $(LIB_fs) $(LIB_simfs) .depend
+ 
+-.depend:: $(OBJ:.o=.c)
+-	$(CC) -M $(FLAGS) $(DEPFLAGS) $(INC) $(OBJ:.o=.c) >.depend
++.depend:: $(OBJ:.o=.c) $(SOBJ:.lo=.c)
++	$(CC) -M $(FLAGS) $(DEPFLAGS) $(INC) $^ >.depend
+ 
+ depend:: .depend
+ 
diff --git a/sys-cluster/vzctl/vzctl-2.7.0.24.ebuild b/sys-cluster/vzctl/vzctl-2.7.0.24.ebuild
index b6e04385c97e..4e3f7f1abf9e 100644
--- a/sys-cluster/vzctl/vzctl-2.7.0.24.ebuild
+++ b/sys-cluster/vzctl/vzctl-2.7.0.24.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-2.7.0.24.ebuild,v 1.3 2005/12/26 07:32:22 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-2.7.0.24.ebuild,v 1.4 2006/01/12 14:30:41 hollow Exp $
 
 inherit eutils toolchain-funcs versionator linux-info
 
@@ -47,6 +47,12 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/vzctl-2.7.0-gentoo_conf_d.patch
 	epatch "${FILESDIR}"/vzctl-2.7.0.23-gentoo_etc_vz.patch
+
+	# fix hardcoded lib paths
+	use amd64 && epatch "${FILESDIR}"/vzctl-2.7.0-amd64.patch
+
+	# PIC
+	epatch "${FILESDIR}"/vzctl-2.7.0.24-pic.patch
 }
 
 src_compile() {
diff --git a/sys-cluster/vzctl/vzctl-2.7.0.25.ebuild b/sys-cluster/vzctl/vzctl-2.7.0.25.ebuild
index 59507f08d778..5458c36fc1f1 100644
--- a/sys-cluster/vzctl/vzctl-2.7.0.25.ebuild
+++ b/sys-cluster/vzctl/vzctl-2.7.0.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-2.7.0.25.ebuild,v 1.1 2006/01/12 09:45:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-2.7.0.25.ebuild,v 1.2 2006/01/12 14:30:41 hollow Exp $
 
 inherit eutils toolchain-funcs versionator linux-info
 
@@ -47,6 +47,9 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/vzctl-2.7.0-gentoo_conf_d.patch
 	epatch "${FILESDIR}"/vzctl-2.7.0.23-gentoo_etc_vz.patch
+
+	# fix hardcoded lib paths
+	use amd64 && epatch "${FILESDIR}"/vzctl-2.7.0-amd64.patch
 }
 
 src_compile() {