_MINIX_SYSTEM - fixes for in-minix crossbuild

. define _MINIX_SYSTEM for all system code from minix.service.mk . hide some system-level declarations and definitions behind _MINIX_SYSTEM to cleanly fix host tool build problems on Minix (such as: NONE being defined and paddr_t being used but not declared) . the similar definition _SYSTEM is unsuitable as it changes the values of errno definitions Change-Id: I407de79e2575115243a074b16e79546a279cfa3e
2014-03-05 12:21:55 +01:00
parent aa6ee31737
commit 3f38115c7b
38 changed files with 63 additions and 13 deletions
--- a/lib/libaudiodriver/Makefile
+++ b/lib/libaudiodriver/Makefile
@@ -1,6 +1,7 @@
 # Makefile for the common audio framework
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM

 LIB=    audiodriver
 SRCS=   audio_fw.c liveupdate.c
--- a/lib/libbdev/Makefile
+++ b/lib/libbdev/Makefile
@@ -1,5 +1,6 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM

 # Makefile for libbdev
 .include <bsd.own.mk>
--- a/lib/libblockdriver/Makefile
+++ b/lib/libblockdriver/Makefile
@@ -1,5 +1,6 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM

 # Makefile for libblockdriver
 .include <bsd.own.mk>
--- a/lib/libc/sys-minix/minix_rs.c
+++ b/lib/libc/sys-minix/minix_rs.c
@@ -1,4 +1,5 @@
 #define _SYSTEM	1
+#define _MINIX_SYSTEM	1

 #include <sys/cdefs.h>

--- a/lib/libc/sys-minix/mmap.c
+++ b/lib/libc/sys-minix/mmap.c
@@ -1,4 +1,5 @@
 #define _SYSTEM 1
+#define _MINIX_SYSTEM 1
 #include <sys/cdefs.h>
 #include "namespace.h"
 #include <lib.h>
--- a/lib/libc/sys-minix/sem.c
+++ b/lib/libc/sys-minix/sem.c
@@ -1,5 +1,6 @@
 #define __USE_MISC
 #define _SYSTEM	1
+#define _MINIX_SYSTEM	1

 #include <sys/cdefs.h>
 #include <lib.h>
--- a/lib/libc/sys-minix/shmat.c
+++ b/lib/libc/sys-minix/shmat.c
@@ -1,4 +1,5 @@
 #define _SYSTEM	1
+#define _MINIX_SYSTEM	1

 #include <sys/cdefs.h>
 #include <lib.h>
--- a/lib/libc/sys-minix/shmctl.c
+++ b/lib/libc/sys-minix/shmctl.c
@@ -1,4 +1,5 @@
 #define _SYSTEM	1
+#define _MINIX_SYSTEM	1

 #include <sys/cdefs.h>
 #include <lib.h>
--- a/lib/libc/sys-minix/stack_utils.c
+++ b/lib/libc/sys-minix/stack_utils.c
@@ -3,6 +3,8 @@
 * Author: Lionel A. Sambuc. 
 */

+#define _MINIX_SYSTEM
+
 #include <sys/cdefs.h>
 #include "namespace.h"
 #include <lib.h>
--- a/lib/libchardriver/Makefile
+++ b/lib/libchardriver/Makefile
@@ -1,5 +1,6 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM

 # Makefile for libchardriver
 .include <bsd.own.mk>
--- a/lib/libclkconf/Makefile
+++ b/lib/libclkconf/Makefile
@@ -3,7 +3,7 @@ NOCLANGERROR=yes
 #
 # Makefile for libclkconf

-CPPFLAGS+= -D_SYSTEM
+CPPFLAGS+= -D_SYSTEM -D_MINIX_SYSTEM

 LIB=	clkconf

--- a/lib/libddekit/build/ddekit/Makefile
+++ b/lib/libddekit/build/ddekit/Makefile
@@ -7,7 +7,7 @@ VPATH = $(SRC_DIR)

 SRCS = pci.c printf.c mem.c pgtab.c dde.c initcall.c thread.c condvar.c lock.c semaphore.c timer.c panic.c irq.c resource.c msg_queue.c

-CFLAGS +=  -D_NETBSD_SOURCE
+CPPFLAGS +=  -D_NETBSD_SOURCE -D_MINIX_SYSTEM

 .include <bsd.lib.mk>

--- a/lib/libgpio/Makefile
+++ b/lib/libgpio/Makefile
@@ -1,6 +1,6 @@
 # Makefile for libgpio

-CPPFLAGS+= -D_SYSTEM
+CPPFLAGS+= -D_SYSTEM -D_MINIX_SYSTEM

 LIB=	gpio

--- a/lib/libi2cdriver/Makefile
+++ b/lib/libi2cdriver/Makefile
@@ -1,6 +1,8 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes

+CPPFLAGS+=-D_MINIX_SYSTEM
+
 # Makefile for libi2cdriver

 LIB=	i2cdriver
--- a/lib/libinputdriver/Makefile
+++ b/lib/libinputdriver/Makefile
@@ -1,5 +1,6 @@
 # Makefile for libinputdriver
 .include <bsd.own.mk>
+CPPFLAGS+= -D_MINIX_SYSTEM

 LIB=	inputdriver

--- a/lib/libminixfs/Makefile
+++ b/lib/libminixfs/Makefile
@@ -1,5 +1,6 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM

 # Makefile for libminixfs
 .include <bsd.own.mk>
--- a/lib/libnetdriver/Makefile
+++ b/lib/libnetdriver/Makefile
@@ -1,5 +1,6 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM

 # Makefile for libnetdriver

--- a/lib/libnetsock/Makefile
+++ b/lib/libnetsock/Makefile
@@ -1,5 +1,6 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM

 LIB = netsock

--- a/lib/libpuffs/Makefile
+++ b/lib/libpuffs/Makefile
@@ -23,6 +23,7 @@ SRCS+=		inode.c link.c misc.c mount.c open.c path.c path_puffs.c \
 		protect.c read.c stadir.c time.c utility.c table.c

 CPFFLAGS+=-Dlchown=chown -Dlchmod=chmod
+CPPFLAGS+= -D_MINIX_SYSTEM

 NOGCCERROR=yes
 NOCLANGERROR=yes
--- a/lib/libsffs/Makefile
+++ b/lib/libsffs/Makefile
@@ -1,5 +1,6 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM

 # Makefile for libsffs
 .include <bsd.own.mk>
--- a/lib/libsys/Makefile
+++ b/lib/libsys/Makefile
@@ -4,6 +4,8 @@ NOCLANGERROR=yes
 # Makefile for libsys
 .include <bsd.own.mk>

+CPPFLAGS+= -D_MINIX_SYSTEM -D_SYSTEM
+
 LIB=		sys

 CFLAGS+=	-fno-builtin
--- a/lib/libsys/asynsend.c
+++ b/lib/libsys/asynsend.c
@@ -1,4 +1,3 @@
-#define _SYSTEM		1

 #include <minix/config.h>
 #include <assert.h> 
--- a/lib/libsys/syslib.h
+++ b/lib/libsys/syslib.h
@@ -1,7 +1,5 @@
 /*	syslib.h - System library common definitions.	*/

-#define _SYSTEM
-
 #include <lib.h>
 #include <minix/com.h>
 #include <minix/syslib.h>
--- a/lib/libvirtio/Makefile
+++ b/lib/libvirtio/Makefile
@@ -1,5 +1,6 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM

 # Makefile for libvirtio
 .include <bsd.own.mk>
--- a/lib/libvtreefs/Makefile
+++ b/lib/libvtreefs/Makefile
@@ -1,5 +1,6 @@
 NOGCCERROR=yes
 NOCLANGERROR=yes
+CPPFLAGS+= -D_MINIX_SYSTEM

 # Makefile for libvtreefs