jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 13:38:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make libjafs buildable again

Browse Source 
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 <steven@synaptian.com>
Tested-by: Steven Jenkins <steven@synaptian.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit 967d7201ee5c27db6d75d5efafcad9458e2b5167)

Change-Id: I0cb510e3f115c2c35f06cf9cbddaf31835704eea
Reviewed-on: http://gerrit.openafs.org/6527
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
This commit is contained in:
Andrew Deason 2012-01-08 11:31:39 -05:00 committed by Derrick Brashear
parent 57a45a64bb
commit 873ac9cc94
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/JAVA/libjafs/Group.c
View File

@ -22,6 +22,8 @@
#include "Internal.h"
#include "org_openafs_jafs_Group.h"
#include <afs_vosAdmin.h>
#include <stdio.h>
#include <afs_ptsAdmin.h>
#include <afs_AdminPtsErrors.h>

8
src/JAVA/libjafs/Makefile.in
View File

@ -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 =\