make-darwin-14-build-with-new-makefile-frag-system-20011110

head now builds on darwin 1.4; may not build in objdir env yet

diff --git a/src/afs/DARWIN/osi_vm.c b/src/afs/DARWIN/osi_vm.c
index b590b4cadf754f74bbdf6689c082e02c13a7cbfd..a5030b2ba754f67bad9c451e6cacdaf59fc19ec2 100644 (file)
--- a/src/afs/DARWIN/osi_vm.c
+++ b/src/afs/DARWIN/osi_vm.c
@@ -247,14 +247,14 @@ void osi_VM_TryReclaim(avc, slept)
         else
            VOP_UNLOCK(vp, 0, p);
         if (obj) {
-        if (ISSET(vp->v_flag, VTERMINATE))
-            panic("afs_vnreclaim: already teminating");
-        SET(vp->v_flag, VTERMINATE);
-        memory_object_destroy(obj, 0);
-        while (ISSET(vp->v_flag, VTERMINATE)) {
-              SET(vp->v_flag, VTERMWANT);
-              tsleep((caddr_t)&vp->v_ubcinfo, PINOD, "afs_vnreclaim", 0);
-        }
+            if (ISSET(vp->v_flag, VTERMINATE))
+                panic("afs_vnreclaim: already teminating");
+            SET(vp->v_flag, VTERMINATE);
+            memory_object_destroy(obj, 0);
+            while (ISSET(vp->v_flag, VTERMINATE)) {
+                  SET(vp->v_flag, VTERMWANT);
+                  tsleep((caddr_t)&vp->v_ubcinfo, PINOD, "afs_vnreclaim", 0);
+            }
         }
    } else {
         if (simple_lock_try(&vp->v_interlock))

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 1d0185d34c7c6e6ada4979a3dd8fe1a516addb5f..44eeb331bc8c1a201c03cf519662abcc8e8c0e7b 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -173,7 +173,6 @@ case $AFS_SYSNAME in
                ;;
 
        ppc_darwin_12)
-               KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
                LEX="lex -l"
                LWP_OPTMZ="-g"
                OPTMZ="-g"
@@ -182,7 +181,6 @@ case $AFS_SYSNAME in
                ;;
 
        ppc_darwin_13)
-               KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
                LEX="lex -l"
                LWP_OPTMZ="-O2"
                REGEX_OBJ="regex.o"
@@ -190,7 +188,6 @@ case $AFS_SYSNAME in
                ;;
 
        ppc_darwin_14)
-               KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
                LEX="lex -l"
                LWP_OPTMZ="-O2"
                REGEX_OBJ="regex.o"

diff --git a/src/libafs/MakefileProto.DARWIN.in b/src/libafs/MakefileProto.DARWIN.in
index e31d145ff4a1e71e63a55740832ea660948ceeb6..9a60e5929c40acb67a4846db366669e95faddb9a 100644 (file)
--- a/src/libafs/MakefileProto.DARWIN.in
+++ b/src/libafs/MakefileProto.DARWIN.in
@@ -32,9 +32,8 @@ KDEFS=
 DBUG = 
 DEFINES= -D_KERNEL -DKERNEL -DKERNEL_PRIVATE -DDIAGNOSTIC -DUSE_SELECT -DMACH_USER_API -DMACH_KERNEL
 KOPTS=-no-precomp -static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch 
-#CFLAGS=-Werror-implicit-function-declaration -I. -I.. ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
-#CFLAGS=-framework Kernel -I. -I.. ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
 CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${KINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG} ${OPTMZ}
+KINCLUDES=-I${KROOT}/System/Library/Frameworks/Kernel.Framework/Headers
 
 
 # Name of directory to hold object files and libraries.
@@ -78,14 +77,14 @@ libafs: $(LIBAFSNONFS) ;
 install_libafs: $(LIBAFSNONFS) ;
        -mkdir -p ${INST_LIBAFSNONFS}
        -mkdir -p ${INST_LIBAFSNONFS}/Contents
-       $(INSTALL) -f ${DARWIN_INFOFILE} ${INST_LIBAFSNONFS}/Contents/Info.plist
+       $(INSTALL) -f ../${DARWIN_INFOFILE} ${INST_LIBAFSNONFS}/Contents/Info.plist
        -mkdir -p ${INST_LIBAFSNONFS}/Contents/MacOS
        $(INSTALL) -f ${LIBAFSNONFS} ${INST_LIBAFSNONFS}/Contents/MacOS/afs
 
 dest_libafs: $(LIBAFSNONFS) ;
        -mkdir -p ${DEST_LIBAFSNONFS}
        -mkdir -p ${DEST_LIBAFSNONFS}/Contents
-       $(INSTALL) -f ${DARWIN_INFOFILE} ${DEST_LIBAFSNONFS}/Contents/Info.plist
+       $(INSTALL) -f ../${DARWIN_INFOFILE} ${DEST_LIBAFSNONFS}/Contents/Info.plist
        -mkdir -p ${DEST_LIBAFSNONFS}/Contents/MacOS
        $(INSTALL) -f ${LIBAFSNONFS} ${DEST_LIBAFSNONFS}/Contents/MacOS/afs