From: Andrew Deason <adeason@sinenomine.net>
Date: Tue, 21 Jun 2011 22:51:32 +0000 (-0500)
Subject: Build a separate copy of vlib for dasalvager
X-Git-Tag: upstream/1.6.0.pre7^2~27
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=ae81606a284e2144f32bd55cbdba104c00d54d93;p=packages%2Fo%2Fopenafs.git

Build a separate copy of vlib for dasalvager

Currently dasalvager links to vlib.a. But vlib.a is built without any
DAFS defines, and so the size of a struct DiskPartition64 is different
(since dasalvager is built with AFS_DEMAND_ATTACH_UTIL). Build our own
copies of the volume package files instead, with
AFS_DEMAND_ATTACH_UTIL defined.

(cherry picked from commit f2d067b4e48500004236b181dd5a25454f352daf)
Reviewed-on: http://gerrit.openafs.org/4875
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>

Change-Id: Id65a30ced198853bc6c376153671def71dd600d1
Reviewed-on: http://gerrit.openafs.org/4943
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/tsalvaged/Makefile.in b/src/tsalvaged/Makefile.in
index 047704522..35c9213fa 100644
--- a/src/tsalvaged/Makefile.in
+++ b/src/tsalvaged/Makefile.in
@@ -33,7 +33,7 @@ VOL=../vol
 FSINT=../fsint
 
 SALVAGEDOBJS=salvaged.o vol-salvage.o physio.o
-SALVAGEROBJS=salvager.o svol-salvage.o sphysio.o
+SALVAGEROBJS=salvager.o s_vol-salvage.o s_physio.o
 
 DIROBJS=buffer.o dir.o salvage.o
 
@@ -44,9 +44,12 @@ UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o
 VLIBOBJS=volume.o vnode.o vutil.o partition.o fssync-client.o \
 	 clone.o nuke.o devname.o listinodes.o ihandle.o \
 	 namei_ops.o salvsync-server.o salvsync-client.o daemon_com.o
+SVLIBOBJS=s_volume.o s_vnode.o s_vutil.o s_partition.o s_fssync-client.o \
+	 s_clone.o s_nuke.o s_devname.o s_listinodes.o s_ihandle.o \
+	 s_namei_ops.o s_salvsync-server.o s_salvsync-client.o s_daemon_com.o
 
 OBJECTS= ${SALVAGEDOBJS} ${UTILOBJS} ${VLIBOBJS} ${DIROBJS} ${LWPOBJS}
-SOBJECTS= ${SALVAGEROBJS}
+SOBJECTS= ${SALVAGEROBJS} ${SVLIBOBJS}
 
 FSSDEBUG_OBJS = fssync-debug.o physio.o common.o ${UTILOBJS} ${VLIBOBJS} ${DIROBJS} ${LWPOBJS}
 
@@ -55,7 +58,7 @@ SSSDEBUG_OBJS = salvsync-debug.o physio.o common.o ${UTILOBJS} ${VLIBOBJS} ${DIR
 LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libcmd.a
 
 SLIBS=${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libdir.a \
-	${TOP_LIBDIR}/libvlib.a ${TOP_LIBDIR}/librx.a \
+	${TOP_LIBDIR}/librx.a \
 	${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libacl.a \
 	${TOP_LIBDIR}/util.a
 
@@ -70,13 +73,40 @@ salvager.o: ${VOL}/salvager.c
 vol-salvage.o: ${VOL}/vol-salvage.c
 	${CCRULE}
 
-svol-salvage.o: ${VOL}/vol-salvage.c
-	${SCCRULE}
-
 physio.o: ${VOL}/physio.c
 	${CCRULE}
 
-sphysio.o: ${VOL}/physio.c
+s_vol-salvage.o: ${VOL}/vol-salvage.c
+	${SCCRULE}
+s_physio.o: ${VOL}/physio.c
+	${SCCRULE}
+s_volume.o: ${VOL}/volume.c
+	${SCCRULE}
+s_vnode.o: ${VOL}/vnode.c
+	${SCCRULE}
+s_vutil.o: ${VOL}/vutil.c
+	${SCCRULE}
+s_partition.o: ${VOL}/partition.c
+	${SCCRULE}
+s_fssync-client.o: ${VOL}/fssync-client.c
+	${SCCRULE}
+s_clone.o: ${VOL}/clone.c
+	${SCCRULE}
+s_nuke.o: ${VOL}/nuke.c
+	${SCCRULE}
+s_devname.o: ${VOL}/devname.c
+	${SCCRULE}
+s_listinodes.o: ${VOL}/listinodes.c
+	${SCCRULE}
+s_ihandle.o: ${VOL}/ihandle.c
+	${SCCRULE}
+s_namei_ops.o: ${VOL}/namei_ops.c
+	${SCCRULE}
+s_salvsync-server.o: ${VOL}/salvsync-server.c
+	${SCCRULE}
+s_salvsync-client.o: ${VOL}/salvsync-client.c
+	${SCCRULE}
+s_daemon_com.o: ${VOL}/daemon_com.c
 	${SCCRULE}
 
 fssync-debug.o: ${VOL}/fssync-debug.c