[pkgsrc/trunk]: pkgsrc/bootstrap/bmake Add temporary Interix-only hack: don't...

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8320bffe7edc
branches:  trunk
changeset: 486956:8320bffe7edc
user:      tv <tv%pkgsrc.org@localhost>
date:      Wed Jan 05 21:54:40 2005 +0000

description:
Add temporary Interix-only hack: don't set the MAKEFILE variable based on
what files exist in the fs.

This works around a problem that crops up when using a nfs-mounted pkgsrc
repository under Interix.  (When going to "su" during the install phase,
bmake sees "makefile" for a moment in lieu of "Makefile", and all hell
breaks loose.)

diffstat:

 bootstrap/bmake/main.c |  17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diffs (51 lines):

diff -r 003cbfe4b08b -r 8320bffe7edc bootstrap/bmake/main.c
--- a/bootstrap/bmake/main.c    Wed Jan 05 21:51:19 2005 +0000
+++ b/bootstrap/bmake/main.c    Wed Jan 05 21:54:40 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.1.1.1 2004/03/11 13:04:10 grant Exp $       */
+/*     $NetBSD: main.c,v 1.2 2005/01/05 21:54:40 tv Exp $      */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -39,7 +39,7 @@
  */
 
 #ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: main.c,v 1.1.1.1 2004/03/11 13:04:10 grant Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.2 2005/01/05 21:54:40 tv Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
@@ -51,13 +51,13 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.1.1.1 2004/03/11 13:04:10 grant Exp $");
+__RCSID("$NetBSD: main.c,v 1.2 2005/01/05 21:54:40 tv Exp $");
 #endif
 #endif /* not lint */
 #endif
 
 #if !defined(MAKE_BOOTSTRAP) && !defined(lint)
-__IDSTRING(rcs_id,"$Id: main.c,v 1.1.1.1 2004/03/11 13:04:10 grant Exp $");
+__IDSTRING(rcs_id,"$Id: main.c,v 1.2 2005/01/05 21:54:40 tv Exp $");
 #endif
 
 /*-
@@ -1032,7 +1032,16 @@
                Parse_File("(stdin)", stdin);
                Var_Set("MAKEFILE", "", VAR_GLOBAL, 0);
        } else {
+#ifdef __INTERIX
+               /* XXX tv: Hack pending a fix to bsd.pkg.mk to use some other
+                  variable name than this.  When using a NFS pkgsrc repository,
+                  bmake thinks "makefile" exists when running under "su" even
+                  though the filesystem is mounted case-sensitive on the
+                  non-su side.  This hoses all sorts of fun things. */
+               setMAKEFILE = FALSE;
+#else
                setMAKEFILE = strcmp(fname, ".depend");
+#endif
 
                /* if we've chdir'd, rebuild the path name */
                if (curdir != objdir && *fname != '/') {