LINUX: Avoid building rand-fortuna-kernel.o

[openafs.git] / src / libafs / MakefileProto.FBSD.in

diff --git a/src/libafs/MakefileProto.FBSD.in b/src/libafs/MakefileProto.FBSD.in
index a3f2bff..ee34518 100644 (file)
--- a/src/libafs/MakefileProto.FBSD.in
+++ b/src/libafs/MakefileProto.FBSD.in
@@ -8,11 +8,6 @@
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 
-# rx_event is miscompiled by gcc at -O0, causing panic on startup
-.if empty(${CFLAGS:M-O})
-CFLAGS+=       -O
-.endif
-
 # tell bsd.kmod.mk to build us vnode_if*
 SRCS=  vnode_if.h
 
@@ -36,6 +31,9 @@ SRCS+= \
        osi_vnodeops.c \
        osi_module.c
 
+AFS_OS_OBJS = \
+       rand-fortuna-kernel.o
+
 #AFS_OS_NFSOBJS = \
 #      osi_vfsops_nfs.o
 
@@ -46,10 +44,15 @@ AFS_OS_NONFSOBJS = \
 KSRC = @BSD_KERNEL_PATH@
 KBLD = @BSD_KERNEL_BUILD@
 
+LIBAFS_REQ_DIRS = $(DESTDIR)$(KMODDIR)/
+
 # keep symbols if --enable-debug-kernel
 AC_DEBUG_FLAGS = @DEBUG_FLAGS@
 .if !empty(AC_DEBUG_FLAGS)
 DEBUG_FLAGS=   ${AC_DEBUG_FLAGS}
+
+# For debug builds, we also need /usr/lib/debug/* dirs to exist
+LIBAFS_REQ_DIRS += ${DESTDIR}${KERN_DEBUGDIR}${KMODDIR}/
 .endif
 
 # We are not doing very well (WARNS=2 brings in printf format type checking)
@@ -60,8 +63,12 @@ CWARNFLAGS+= -Wno-redundant-decls
 # setup for bsd.kmod.mk infrastructure
 .PATH: ${TOP_SRCDIR}/afs/FBSD
 KMODDIR=/boot/modules
+KERN_DEBUGDIR=/usr/lib/debug
 KMOD=  libafs
 SYSDIR= ${KSRC}
+.if !empty(KBLD)
+KERNBUILDDIR=${KBLD}
+.endif
 
 # Name of directory to hold object files and libraries.
 KOBJ = MODLOAD
@@ -94,7 +101,7 @@ OBJS=        ${AFSAOBJS} ${AFSNONFSOBJS}
 
 LIBAFSNONFS=   libafs.ko
 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
-CFLAGS+= $(DEFINES) ${COMMON_INCLUDE} -I@/sys -Imachine
+CFLAGS+= $(DEFINES) ${COMMON_INCLUDE}
 
 INST_LIBAFS = ${DESTDIR}${afskerneldir}/${LIBAFS}
 INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/${LIBAFSNONFS}
@@ -102,7 +109,13 @@ INST_LIBAFSNONFS = ${DESTDIR}${afskerneldir}/${LIBAFSNONFS}
 DEST_LIBAFS = ${DEST}/root.client/bin/${LIBAFS}
 DEST_LIBAFSNONFS = ${DEST}/root.client/bin/${LIBAFSNONFS}
 
-install_libafs:        $(LIBAFSNONFS) install
+$(DESTDIR)$(KMODDIR)/:
+       $(INSTALL) -d $@
+
+${DESTDIR}${KERN_DEBUGDIR}${KMODDIR}/:
+       $(INSTALL) -d $@
+
+install_libafs:        $(LIBAFSNONFS) $(LIBAFS_REQ_DIRS) install
 
 dest_libafs: $(LIBAFSNONFS)
        ${INSTALL} -d ${DEST}/root.client/bin