jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 23:10:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

host-cpu-20060120

Browse Source 
Introduce @HOST_CPU@ and use it to find correct headers for FreeBSD build.
This commit is contained in:
Jim Rees 2006-01-20 16:40:24 +00:00
parent 1afcbc9441
commit 5790bf7cd0
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
acinclude.m4
View File

@ -892,6 +892,8 @@ if test "$enable_obsolete" = "yes"; then
WITH_OBSOLETE=YES WITH_OBSOLETE=YES
fi fi
HOST_CPU="$host_cpu"
if test "x$with_bsd_kernel_headers" != "x"; then if test "x$with_bsd_kernel_headers" != "x"; then
BSD_KERNEL_PATH="$with_bsd_kernel_headers" BSD_KERNEL_PATH="$with_bsd_kernel_headers"
else else
@ -902,11 +904,11 @@ if test "x$with_bsd_kernel_build" != "x"; then
BSD_KERNEL_BUILD="$with_bsd_kernel_build" BSD_KERNEL_BUILD="$with_bsd_kernel_build"
else else
case $AFS_SYSNAME in case $AFS_SYSNAME in
i386_fbsd_4?) *_fbsd_4?)
BSD_KERNEL_BUILD="${BSD_KERNEL_PATH}/compile/GENERIC" BSD_KERNEL_BUILD="${BSD_KERNEL_PATH}/compile/GENERIC"
;; ;;
i386_fbsd_*) *_fbsd_*)
BSD_KERNEL_BUILD="${BSD_KERNEL_PATH}/i386/compile/GENERIC" BSD_KERNEL_BUILD="${BSD_KERNEL_PATH}/${HOST_CPU}/compile/GENERIC"
;; ;;
esac esac
fi fi
@ -1078,6 +1080,7 @@ AC_SUBST(AFS_PARAM_COMMON)
AC_SUBST(ENABLE_KERNEL_MODULE) AC_SUBST(ENABLE_KERNEL_MODULE)
AC_SUBST(LIB_AFSDB) AC_SUBST(LIB_AFSDB)
AC_SUBST(LINUX_KERNEL_PATH) AC_SUBST(LINUX_KERNEL_PATH)
AC_SUBST(HOST_CPU)
AC_SUBST(BSD_KERNEL_PATH) AC_SUBST(BSD_KERNEL_PATH)
AC_SUBST(BSD_KERNEL_BUILD) AC_SUBST(BSD_KERNEL_BUILD)
AC_SUBST(LINUX_VERSION) AC_SUBST(LINUX_VERSION)

2
src/libafs/MakefileProto.FBSD.in
View File

@ -67,7 +67,7 @@ setup:
ln -fs ../Makefile.common $(KOBJ)/Makefile.common ln -fs ../Makefile.common $(KOBJ)/Makefile.common
-$(RM) -f h net netinet rpc ufs nfs machine sys vm -$(RM) -f h net netinet rpc ufs nfs machine sys vm
-ln -fs ${KSRC}/net net -ln -fs ${KSRC}/net net
-ln -fs ${KSRC}/i386/include machine -ln -fs ${KSRC}/@HOST_CPU@/include machine
-ln -fs ${KSRC}/netinet netinet -ln -fs ${KSRC}/netinet netinet
-ln -fs ${KSRC}/nfs nfs -ln -fs ${KSRC}/nfs nfs
-ln -fs /usr/include/rpc rpc -ln -fs /usr/include/rpc rpc