From 454cfb405a82d2f334b313d37c365bd43cfb444e Mon Sep 17 00:00:00 2001
From: jacob <jacob>
Date: Thu, 9 Dec 2004 23:27:44 +0000
Subject: [PATCH] b_port_step files
---
build/autoconf/lustre-build-darwin.m4 | 19 ++++++++++++++++++-
build/autoconf/lustre-build.m4 | 13 ++++++++-----
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/build/autoconf/lustre-build-darwin.m4 b/build/autoconf/lustre-build-darwin.m4
index f59e82a8f4..cd1704ac55 100644
--- a/build/autoconf/lustre-build-darwin.m4
+++ b/build/autoconf/lustre-build-darwin.m4
@@ -13,5 +13,22 @@ AC_DEFUN([LB_DARWIN_CONDITIONALS],
# darwin tests
#
AC_DEFUN([LB_PROG_DARWIN],
-[
+[kernel_framework="/System/Library/Frameworks/Kernel.framework"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -x c -arch ppc -pipe -Wno-trigraphs"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -fasm-blocks -g -O0 -mtune=G4"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Wno-four-char-constants -Wmost -O0"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -fmessage-length=0 -ffix-and-continue"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -I$kernel_framework/Headers"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -I$kernel_framework/Headers/bsd"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -I$kernel_framework/PrivateHeaders"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -fno-common -nostdinc -fno-builtin"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -finline -fno-keep-inline-functions"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -force_cpusubtype_ALL -fno-exceptions"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -msoft-float -static -mlong-branch"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -DKERNEL -DKERNEL_PRIVATE"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -DDRIVER_PRIVATE -DAPPLE -DNeXT"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -D__KERNEL__ -D__DARWIN__"
+EXTRA_KLDFLAGS="-arch ppc -static -nostdlib -r"
+EXTRA_KLIBS="-lkmodc++ -lkmod -lcc_kext"
+KMODEXT=""
])
diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 3d9afdd520..7994f25ec4 100644
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -20,6 +20,7 @@ AC_DEFUN([LB_PATH_LIBSYSIO],
[set path to libsysio source (default is included libsysio)]),
[],[with_sysio='yes'])
AC_MSG_CHECKING([location of libsysio])
+enable_sysio="$with_sysio"
case x$with_sysio in
xyes)
AC_MSG_RESULT([internal])
@@ -39,6 +40,7 @@ case x$with_sysio in
AC_MSG_ERROR([A complete (built) external libsysio was not found.])
])
SYSIO=$with_sysio
+ enable_sysio="yes"
;;
esac
AC_SUBST(LIBSYSIO_SUBDIR)
@@ -124,7 +126,7 @@ AC_ARG_ENABLE([modules],
[disable building of Lustre kernel modules]),
[],[
case $target_os in
- linux* | darwin)
+ linux* | darwin*)
enable_modules='yes'
;;
*)
@@ -137,10 +139,12 @@ AC_MSG_RESULT([$enable_modules ($target_os)])
if test x$enable_modules = xyes ; then
case $target_os in
linux*)
- LB_PROG_LINUX
+ LC_LINUX_SUPPORTED([LB_PROG_LINUX],
+ [AC_MSG_ERROR([Modules are not supported on $target_os])])
;;
- darwin)
- LB_PROG_DARWIN
+ darwin*)
+ LC_DARWIN_SUPPORTED([LB_PROG_DARWIN],
+ [AC_MSG_ERROR([Modules are not supported on $target_os])])
;;
*)
AC_MSG_ERROR([Modules are not supported on $target_os])
@@ -276,7 +280,6 @@ LC_PATH_DEFAULTS
#
AC_DEFUN([LB_PROG_CC],
[AC_PROG_RANLIB
-AC_PROG_CC
AC_MSG_CHECKING([for buggy compiler])
CC_VERSION=`$CC -v 2>&1 | grep "^gcc version"`
bad_cc() {
--
GitLab