Two patches here, one for rumprun (the user of these variables), another
for src-netbsd. Please review. Fixes rumprun issue #38 (build fails on
certain distros with dash as /bin/sh).
Who are the other downstream users that may be affected by this change?
Related, while looking at the output from my instrumeted copy of 'dash',
the following code at nbmake main.c:996 is suspect:
/* some makefiles need to know this */
Var_Set(MAKE_LEVEL ".ENV", MAKE_LEVEL_ENV, VAR_CMD, 0);
Using VAR_CMD here causes an underlying call to setenv(".MAKE.LEVEL.ENV",
MAKE_LEVEL_ENV). Should the call to Var_Set() use VAR_GLOBAL instead? There
doesn't seem to be any point in exporting ".MAKE.LEVEL.ENV=MAKELEVEL" given
that it's set anew on each invocation of make and POSIX-compliant shells
may refuse to set the variable anyway.
diff --git a/lib/Makefile.pcicommon b/lib/Makefile.pcicommon
index 4ba0222..085b413 100644
--- a/lib/Makefile.pcicommon
+++ b/lib/Makefile.pcicommon
@@ -5,21 +5,21 @@
RUMPTOP= ${TOPRUMP}
MYDIR:= ${.PARSEDIR}
-RUMPCOMP_USER_SRCS.rumpdev_pci= ${PCI_HYPERCALLS}
-RUMPCOMP_USER_PATH.rumpdev_pci= ${PCI_HYPERCALLS_PATH}
-RUMPCOMP_USER_CPPFLAGS.rumpdev_pci= ${PCI_CPPFLAGS}
-RUMPCOMP_USER_CPPFLAGS.rumpdev_pci+= -I${MYDIR}/../include
-RUMPCOMP_USER_CPPFLAGS.rumpdev_pci+= -I${RROBJ}/include
-RUMPCOMP_USER_CPPFLAGS.rumpdev_pci+= -I${PCI_HYPERCALLS_PATH}
-RUMPCOMP_USER_CFLAGS.rumpdev_pci= ${BUILDRUMP_TOOL_CFLAGS}
+RUMPCOMP_USER_SRCS_rumpdev_pci= ${PCI_HYPERCALLS}
+RUMPCOMP_USER_PATH_rumpdev_pci= ${PCI_HYPERCALLS_PATH}
+RUMPCOMP_USER_CPPFLAGS_rumpdev_pci= ${PCI_CPPFLAGS}
+RUMPCOMP_USER_CPPFLAGS_rumpdev_pci+= -I${MYDIR}/../include
+RUMPCOMP_USER_CPPFLAGS_rumpdev_pci+= -I${RROBJ}/include
+RUMPCOMP_USER_CPPFLAGS_rumpdev_pci+= -I${PCI_HYPERCALLS_PATH}
+RUMPCOMP_USER_CFLAGS_rumpdev_pci= ${BUILDRUMP_TOOL_CFLAGS}
-RUMPCOMP_CPPFLAGS.rumpdev_pci= -I${PCI_HYPERCALLS_PATH}
+RUMPCOMP_CPPFLAGS_rumpdev_pci= -I${PCI_HYPERCALLS_PATH}
-.export RUMPCOMP_USER_SRCS.rumpdev_pci
-.export RUMPCOMP_USER_PATH.rumpdev_pci
-.export RUMPCOMP_USER_CFLAGS.rumpdev_pci
-.export RUMPCOMP_USER_CPPFLAGS.rumpdev_pci
-.export RUMPCOMP_CPPFLAGS.rumpdev_pci
+.export RUMPCOMP_USER_SRCS_rumpdev_pci
+.export RUMPCOMP_USER_PATH_rumpdev_pci
+.export RUMPCOMP_USER_CFLAGS_rumpdev_pci
+.export RUMPCOMP_USER_CPPFLAGS_rumpdev_pci
+.export RUMPCOMP_CPPFLAGS_rumpdev_pci
.include "${RUMPTOP}/dev/Makefile.rumpdevcomp"
diff --git a/sys/rump/dev/lib/libpci/Makefile b/sys/rump/dev/lib/libpci/Makefile
index ee314d3..a9b3c1b 100644
--- a/sys/rump/dev/lib/libpci/Makefile
+++ b/sys/rump/dev/lib/libpci/Makefile
@@ -31,21 +31,21 @@ CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
.error RUMP_PCI_IOSPACE defined in Makefile. Use userfeatures.h instead.
.endif
-.PATH: ${RUMPCOMP_USER_PATH.rumpdev_pci}
-RUMPCOMP_USER_SRCS= ${RUMPCOMP_USER_SRCS.rumpdev_pci}
+.PATH: ${RUMPCOMP_USER_PATH_rumpdev_pci}
+RUMPCOMP_USER_SRCS= ${RUMPCOMP_USER_SRCS_rumpdev_pci}
MYDIR:= ${.PARSEDIR}
RUMPCOMP_USER_CPPFLAGS= -I${MYDIR}
-RUMPCOMP_USER_CPPFLAGS+=${RUMPCOMP_USER_CPPFLAGS.rumpdev_pci}
-RUMPCOMP_USER_CFLAGS= ${RUMPCOMP_USER_CFLAGS.rumpdev_pci}
+RUMPCOMP_USER_CPPFLAGS+=${RUMPCOMP_USER_CPPFLAGS_rumpdev_pci}
+RUMPCOMP_USER_CFLAGS= ${RUMPCOMP_USER_CFLAGS_rumpdev_pci}
-CPPFLAGS+= ${RUMPCOMP_CPPFLAGS.rumpdev_pci}
+CPPFLAGS+= ${RUMPCOMP_CPPFLAGS_rumpdev_pci}
# XXX: messy
.undef RUMPKERN_ONLY
-.ifdef RUMPCOMP_MAKEFILEINC.rumpdev_pci
+.ifdef RUMPCOMP_MAKEFILEINC_rumpdev_pci
.warning RUMPCOMP_MAKEFILEINC interface is unstable and may change
-.include "${RUMPCOMP_MAKEFILEINC.rumpdev_pci}"
+.include "${RUMPCOMP_MAKEFILEINC_rumpdev_pci}"
.endif
.include "${RUMPTOP}/Makefile.rump"
