On Friday, 04.03.2016 at 18:03, Martin Lucina wrote:
> > .PATH is essentially +=, i.e. you can specify it many times. However, I'm
> > not sure if it will barf from an empty value or not, but in any case you can
> > use an intermediate variable.
>
> Ok, how about this (updated patch to src-netbsd). Tested with the new
> variables in lib/Makefile.pcicommon, not with the old ones, but it should
> work.
I've re-tested these patches in the order they should be applied, i.e.
current rumprun master with 0001-src-netbsd-rump-libpci.patch only (works
assuming you build on a system w/o the new dash), followed by applying
0002-rumprun-pcicommon.patch to rumprun (also works, on Debian stretch with
new dash as expected).
Given these results I think these are ready to be merged.
Antti, can you apply the src-netbsd patch, let me know once you pull the
changes to rumprun and then I'll commit the rumprun part?
Both patches included here for the record:
----0001-src-netbsd-rump-libpci.patch
diff --git a/sys/rump/dev/lib/libpci/Makefile b/sys/rump/dev/lib/libpci/Makefile
index ee314d3..36dd463 100644
--- a/sys/rump/dev/lib/libpci/Makefile
+++ b/sys/rump/dev/lib/libpci/Makefile
@@ -31,14 +31,22 @@ CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
.error RUMP_PCI_IOSPACE defined in Makefile. Use userfeatures.h instead.
.endif
-.PATH: ${RUMPCOMP_USER_PATH.rumpdev_pci}
+# the "."-separated names below are deprecated due to relying on non-POSIX
+# /bin/sh, new users please use the "_"-separated names
+MYPATH= ${RUMPCOMP_USER_PATH.rumpdev_pci}
+MYPATH+= ${RUMPCOMP_USER_PATH_rumpdev_pci}
+.PATH: ${MYPATH}
RUMPCOMP_USER_SRCS= ${RUMPCOMP_USER_SRCS.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_CPPFLAGS+=${RUMPCOMP_USER_CPPFLAGS_rumpdev_pci}
RUMPCOMP_USER_CFLAGS= ${RUMPCOMP_USER_CFLAGS.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
@@ -47,6 +55,10 @@ CPPFLAGS+= ${RUMPCOMP_CPPFLAGS.rumpdev_pci}
.warning RUMPCOMP_MAKEFILEINC interface is unstable and may change
.include "${RUMPCOMP_MAKEFILEINC.rumpdev_pci}"
.endif
+.ifdef RUMPCOMP_MAKEFILEINC_rumpdev_pci
+.warning RUMPCOMP_MAKEFILEINC interface is unstable and may change
+.include "${RUMPCOMP_MAKEFILEINC_rumpdev_pci}"
+.endif
.include "${RUMPTOP}/Makefile.rump"
.include <bsd.lib.mk>
----0002-rumprun-pcicommon.patch
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"
