From 9220bd4adc6cf58b29fcdae053edd3b6f0165891 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Wed, 22 Aug 2012 12:45:43 +0100 Subject: [PATCH] Don't explicitly build and link rx_pthread.o A number of pthreaded directories explicitly build, and link, with rx_pthread.o, in order to be able to send RX 'dpf' debugging messages to the server log, rather than to stderr. However, this direct linking causes build failures on some platforms, because we end up linking in a version of rx_pthread.o, twice and both versions contain identical linker symbols. As this functionality is only used for debugging, just get rid of the additional object. Change-Id: I6126891db2dcbc289f6a9f7b99c01d6af7a19089 Reviewed-on: http://gerrit.openafs.org/8071 Reviewed-by: Derrick Brashear Tested-by: BuildBot --- src/dviced/Makefile.in | 9 +-------- src/dvolser/Makefile.in | 9 +-------- src/tbudb/Makefile.in | 10 +--------- src/tptserver/Makefile.in | 10 +--------- src/tubik/Makefile.in | 19 ++++--------------- src/tvlserver/Makefile.in | 12 +----------- src/tvolser/Makefile.in | 10 +++------- src/viced/Makefile.in | 5 +---- 8 files changed, 13 insertions(+), 71 deletions(-) diff --git a/src/dviced/Makefile.in b/src/dviced/Makefile.in index 2f7ec201c..5b220ac26 100644 --- a/src/dviced/Makefile.in +++ b/src/dviced/Makefile.in @@ -15,7 +15,6 @@ include @TOP_OBJDIR@/src/config/Makefile.pthread MODULE_CFLAGS=-DRXDEBUG -DFSSYNC_BUILD_SERVER \ -DSALVSYNC_BUILD_CLIENT -DAFS_DEMAND_ATTACH_FS -RX=$(srcdir)/../rx VICED=$(srcdir)/../viced VLSERVER=$(srcdir)/../vlserver LIBACL=$(srcdir)/../libacl @@ -37,10 +36,8 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-server.o \ FSINTOBJS= afsint.ss.o -RXOBJS = rx_pthread.o - objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} \ - ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} ${RXOBJS} + ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} SDBGOBJS = state_analyzer.o \ $(top_builddir)/src/util/liboafs_util.la \ @@ -56,10 +53,6 @@ LIBS=${TOP_LIBDIR}/libafsauthent.a \ all: dafileserver state_analyzer -CFLAGS_rx_pthread.o=-DDPF_FSLOG -rx_pthread.o: ${RX}/rx_pthread.c - $(AFS_CCRULE) $(RX)/rx_pthread.c - viced.o: ${VICED}/viced.c $(AFS_CCRULE) $(VICED)/viced.c diff --git a/src/dvolser/Makefile.in b/src/dvolser/Makefile.in index fdac0306a..7d52a319a 100644 --- a/src/dvolser/Makefile.in +++ b/src/dvolser/Makefile.in @@ -18,7 +18,6 @@ LIBACL=$(srcdir)/../libacl DIR=$(srcdir)/../dir VOL=$(srcdir)/../vol VOLSER=$(srcdir)/../volser -RX=$(srcdir)/../rx VOLSEROBJS=volmain.o volprocs.o physio.o voltrans.o volerr.o volint.cs.o dumpstuff.o volint.ss.o volint.xdr.o vscommon.o vol_split.o @@ -32,10 +31,8 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \ clone.o devname.o common.o ihandle.o listinodes.o \ namei_ops.o nuke.o salvsync-client.o daemon_com.o -RXOBJS=rx_pthread.o - objects= ${VOLSEROBJS} ${LIBACLOBJS} \ - ${DIROBJS} ${VOLOBJS} ${RXOBJS} + ${DIROBJS} ${VOLOBJS} LIBS= $(top_builddir)/src/cmd/liboafs_cmd.la \ ${TOP_LIBDIR}/libafsauthent.a \ @@ -47,10 +44,6 @@ LIBS= $(top_builddir)/src/cmd/liboafs_cmd.la \ all: davolserver -CFLAGS_rx_pthread.o = -DDPF_FSLOG -rx_pthread.o: ${RX}/rx_pthread.c - $(AFS_CCRULE) $(RX)/rx_pthread.c - volmain.o: ${VOLSER}/volmain.c $(AFS_CCRULE) -I../volser $(VOLSER)/volmain.c diff --git a/src/tbudb/Makefile.in b/src/tbudb/Makefile.in index 1775c6766..6abbb26a3 100644 --- a/src/tbudb/Makefile.in +++ b/src/tbudb/Makefile.in @@ -15,8 +15,6 @@ HELPER_SPLINT=@HELPER_SPLINT@ RX=$(srcdir)/../rx BUDB=$(srcdir)/../budb -RXOBJS= rx_pthread.o rxkad_errs.o - INCLS=\ ${TOP_INCDIR}/lock.h \ ${TOP_INCDIR}/ubik.h \ @@ -33,7 +31,7 @@ INCLS=\ budb.h $(BUDB)/budb_client.h # library ordering defined by top level makefile -LIBS=${RXOBJS} \ +LIBS= \ ${TOP_LIBDIR}/libbubasics.a \ ${TOP_LIBDIR}/libubik_pthread.a \ ${TOP_LIBDIR}/libafsauthent.a \ @@ -59,12 +57,6 @@ budb_errs.c: ${BUDB}/budb_errs.et # Build targets # -rx_pthread.o: ${RX}/rx_pthread.c - $(AFS_CCRULE) $(RX)/rx_pthread.c - -rxkad_errs.o: ../rxkad/rxkad_errs.c - $(AFS_CCRULE) ../rxkad/rxkad_errs.c - database.o: ${BUDB}/database.c budb_errs.h ${INCLS} $(AFS_CCRULE) $(BUDB)/database.c diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in index 57f5c5db5..639817ecb 100644 --- a/src/tptserver/Makefile.in +++ b/src/tptserver/Makefile.in @@ -15,8 +15,6 @@ ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@ RX=$(srcdir)/../rx PTSERVER=$(srcdir)/../ptserver -RXOBJS= rx_pthread.o rxkad_errs.o - PTOBJS=ptuser.o pterror.o ptint.cs.o ptint.xdr.o INCLS=${TOP_INCDIR}/ubik.h \ @@ -29,7 +27,7 @@ INCLS=${TOP_INCDIR}/ubik.h \ ptint.h \ pterror.h -LIBS_common=$(RXOBJS) \ +LIBS_common= \ ${TOP_LIBDIR}/libubik_pthread.a \ ${TOP_LIBDIR}/libafsauthent.a \ ${TOP_LIBDIR}/libafsrpc.a \ @@ -58,12 +56,6 @@ CFLAGS_ptprocs.o = @CFLAGS_NOSTRICT@ # Build targets # -rx_pthread.o: ${RX}/rx_pthread.c - $(AFS_CCRULE) $(RX)/rx_pthread.c - -rxkad_errs.o: ../rxkad/rxkad_errs.c - $(AFS_CCRULE) ../rxkad/rxkad_errs.c - ptserver.o: ${PTSERVER}/ptserver.c ${INCLS} $(AFS_CCRULE) $(PTSERVER)/ptserver.c diff --git a/src/tubik/Makefile.in b/src/tubik/Makefile.in index 7cec21ccf..9d30c69d6 100644 --- a/src/tubik/Makefile.in +++ b/src/tubik/Makefile.in @@ -13,7 +13,6 @@ HELPER_SPLINT=@HELPER_SPLINT@ ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@ UBIK=$(srcdir)/../ubik -RX=$(srcdir)/../rx LIBOBJS=disk.o remote.o beacon.o recovery.o ubik.o vote.o lock.o phys.o \ ubik_int.cs.o ubik_int.ss.o ubik_int.xdr.o ubikcmd.o \ @@ -23,9 +22,8 @@ INCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \ ${TOP_INCDIR}/rx/rx.h ${TOP_INCDIR}/rx/xdr.h \ ${TOP_INCDIR}/lock.h ubik.h ubik_int.h utst_int.h -RXOBJS = rx_pthread.o -LIBS=${RXOBJS} ${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a \ +LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a \ $(top_builddir)/src/comerr/liboafs_comerr.la \ ${top_builddir}/src/cmd/liboafs_cmd.la \ ${TOP_LIBDIR}/libsys.a \ @@ -40,28 +38,19 @@ depinstall: \ ${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/ubik_int.h -# -# get the pthreaded rx stuff compiled here -# - -CFLAGS_rx_pthread.o = -DDPF_FSLOG -rx_pthread.o: ${RX}/rx_pthread.c - $(AFS_CCRULE) $(RX)/rx_pthread.c - - # # insert comments here # -utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik_pthread.a ${RXOBJS} +utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik_pthread.a $(LT_LDRULE_static) utst_server.o utst_int.ss.o utst_int.xdr.o \ libubik_pthread.a $(LIBS) $(LIB_hcrypto) $(LIB_roken) -utst_client: utst_client.o utst_int.cs.o utst_int.xdr.o libubik_pthread.a ${RXOBJS} +utst_client: utst_client.o utst_int.cs.o utst_int.xdr.o libubik_pthread.a $(LT_LDRULE_static) utst_client.o utst_int.cs.o utst_int.xdr.o \ libubik_pthread.a $(LIBS) $(LIB_hcrypto) $(LIB_roken) -udebug: udebug.o libubik_pthread.a ${RXOBJS} +udebug: udebug.o libubik_pthread.a $(LT_LDRULE_static) udebug.o libubik_pthread.a \ $(LIBS) $(LIB_hcrypto) $(LIB_roken) diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in index d0c51e3df..396407243 100644 --- a/src/tvlserver/Makefile.in +++ b/src/tvlserver/Makefile.in @@ -12,11 +12,8 @@ include @TOP_OBJDIR@/src/config/Makefile.pthread HELPER_SPLINT=@HELPER_SPLINT@ ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@ -RX=$(srcdir)/../rx VLSERVER=$(srcdir)/../vlserver -RXOBJS= rx_pthread.o rxkad_errs.o - INCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/lwp.h \ ${TOP_INCDIR}/lock.h \ @@ -42,7 +39,7 @@ LIBS_server = \ LIBS_client = \ $(LIBS_common) -OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o ${RXOBJS} +OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o all: \ vlserver vlclient vlserver cnvldb vldb_check \ @@ -50,13 +47,6 @@ all: \ depinstall: -rx_pthread.o: ${RX}/rx_pthread.c - $(AFS_CCRULE) $(RX)/rx_pthread.c - -rxkad_errs.o: ../rxkad/rxkad_errs.c - $(AFS_CCRULE) ../rxkad/rxkad_errs.c - - # # Other stuff # diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in index 9d9f8c4ea..a642146f7 100644 --- a/src/tvolser/Makefile.in +++ b/src/tvolser/Makefile.in @@ -19,7 +19,6 @@ LIBACL=$(srcdir)/../libacl DIR=$(srcdir)/../dir VOL=$(srcdir)/../vol VOLSER=$(srcdir)/../volser -RX=$(srcdir)/../rx VOLSEROBJS=volmain.o volprocs.o physio.o voltrans.o volerr.o volint.cs.o dumpstuff.o volint.ss.o volint.xdr.o vscommon.o vol_split.o @@ -35,10 +34,11 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-client.o purge.o \ clone.o devname.o common.o ihandle.o listinodes.o \ namei_ops.o nuke.o salvsync-client.o daemon_com.o -objects= ${VOLSEROBJS} ${LIBACLOBJS} ${DIROBJS} ${VOLOBJS} +objects= ${VOLSEROBJS} ${LWPOBJS} ${LIBACLOBJS} \ + ${DIROBJS} ${VOLOBJS} vosobjects= ${VOSOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} ${DIROBJS} \ - ${VOLOBJS} ${RXOBJS} + ${VOLOBJS} LIBS_common = \ $(top_builddir)/src/cmd/liboafs_cmd.la \ @@ -58,10 +58,6 @@ LIBS_server = \ all: volserver vos -CFLAGS_rx_pthread.o = -DDPF_FSLOG -rx_pthread.o: ${RX}/rx_pthread.c - $(AFS_CCRULE) $(RX)/rx_pthread.c - volmain.o: ${VOLSER}/volmain.c $(AFS_CCRULE) -I../volser $(VOLSER)/volmain.c diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in index ecbe87d2d..76bc19e1c 100644 --- a/src/viced/Makefile.in +++ b/src/viced/Makefile.in @@ -14,7 +14,6 @@ include @TOP_OBJDIR@/src/config/Makefile.pthread MODULE_CFLAGS = -DRXDEBUG -DFSSYNC_BUILD_SERVER -DSALVSYNC_BUILD_CLIENT -RX=$(srcdir)/../rx VLSERVER=$(srcdir)/../vlserver LIBACL=$(srcdir)/../libacl DIR=$(srcdir)/../dir @@ -35,9 +34,7 @@ VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-server.o \ FSINTOBJS = afsint.ss.o -RXOBJS = rx_pthread.o - -objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} \ +objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \ ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} LIBS=${TOP_LIBDIR}/libafsauthent.a \ -- 2.39.5