From 873ac9cc9412d4e2a8631ea27c80c67ba6de9f51 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Sun, 8 Jan 2012 11:31:39 -0500 Subject: [PATCH] Make libjafs buildable again libjafs is surprisingly close to being buildable. Fix a few misc things which have bitrotted over the years so it is possible to actually build: - Add -I$SRC/config to the cflags, so we can include afsconfig.h - Remove references to the nonexistant rxkstats.o - Do not link with UAFS' AFS_component_version_number.o, since this gives us duplicate version number symbols - Include afs_vosAdmin.h in Group.c, to satisfy some missing symbols Reviewed-on: http://gerrit.openafs.org/6524 Reviewed-by: Steven Jenkins Tested-by: Steven Jenkins Reviewed-by: Derrick Brashear (cherry picked from commit 967d7201ee5c27db6d75d5efafcad9458e2b5167) Change-Id: I0cb510e3f115c2c35f06cf9cbddaf31835704eea Reviewed-on: http://gerrit.openafs.org/6527 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/JAVA/libjafs/Group.c | 2 ++ src/JAVA/libjafs/Makefile.in | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/JAVA/libjafs/Group.c b/src/JAVA/libjafs/Group.c index 93b715c8f1..bc89a03f32 100644 --- a/src/JAVA/libjafs/Group.c +++ b/src/JAVA/libjafs/Group.c @@ -22,6 +22,8 @@ #include "Internal.h" #include "org_openafs_jafs_Group.h" +#include + #include #include #include diff --git a/src/JAVA/libjafs/Makefile.in b/src/JAVA/libjafs/Makefile.in index 843fe8d2a0..109e60f449 100644 --- a/src/JAVA/libjafs/Makefile.in +++ b/src/JAVA/libjafs/Makefile.in @@ -36,10 +36,10 @@ SHARED_FLAGS = -shared -Xlinker -Bsymbolic OBJECT_FLAGS = -fPIC -c ifeq "$(BUILD_TYPE)" "admin" - INC := -I${TOP_INCDIR} -I${TOP_INCDIR}/afs/ ${JNI_INC} + INC := -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs/ ${JNI_INC} CFLAGS := ${INC} ${DBG} ${OPTMZ} -I${TOP_SRCDIR}/config ${MT_CFLAGS} else - INC := -I${TOP_SRCDIR}/libuafs -I${TOP_INCDIR} ${JNI_INC} + INC := -I${TOP_SRCDIR}/config -I${TOP_SRCDIR}/libuafs -I${TOP_INCDIR} ${JNI_INC} CFLAGS := ${INC} ${DBG} ${OPTMZ} ${FSINCLUDES} -D_REENTRANT -DLIBJUAFS ${MT_CFLAGS} endif @@ -94,9 +94,8 @@ LIBJAFS_OBJS +=\ ${LIBJAFSADMDIR}Internal.o \ ${LIBJAFSADMDIR}UserToken.o \ ${LIBJAFSADMDIR}VersionInfo.o \ - ${TOP_SRCDIR}/libuafs/UAFS/AFS_component_version_number.o \ ${TOP_SRCDIR}/libuafs/UAFS/xdr_int32.o \ - ${TOP_SRCDIR}/util/rxkstats.o + ${TOP_SRCDIR}/util/rxkstats.o ifeq (${SYS_NAME}, ppc64_linux26) LIBJAFSADM_OBJS =\ @@ -123,7 +122,6 @@ LIBJAFSADM_OBJS +=\ ${LIBJAFSADMDIR}Server.o \ ${LIBJAFSADMDIR}User.o \ ${LIBJAFSADMDIR}Version2.o \ - ${TOP_SRCDIR}/libuafs/UAFS/AFS_component_version_number.o \ ${LIBJAFSADMDIR}Volume.o CORRELATING_SOURCE_FILES =\