summaryrefslogtreecommitdiff
path: root/libdde_linux26
diff options
context:
space:
mode:
Diffstat (limited to 'libdde_linux26')
-rw-r--r--libdde_linux26/Makeconf17
-rw-r--r--libdde_linux26/contrib/arch/x86/include/Makefile2
-rw-r--r--libdde_linux26/include/Makefile5
-rw-r--r--libdde_linux26/mk/Makeconf9
-rw-r--r--libdde_linux26/mk/binary.inc16
-rw-r--r--libdde_linux26/mk/include.mk2
-rw-r--r--libdde_linux26/mk/modes.inc16
7 files changed, 40 insertions, 27 deletions
diff --git a/libdde_linux26/Makeconf b/libdde_linux26/Makeconf
index de84e39a..f81b29da 100644
--- a/libdde_linux26/Makeconf
+++ b/libdde_linux26/Makeconf
@@ -13,17 +13,20 @@ ifeq ($(ARCH), arm)
KBUILD_CPPFLAGS = -include linux/autoconf-arm.h
endif
+OBJ_BASE = /root/hurd/libdde_linux26/build
+
# includes
-MY_DDE_INCDIR = $(OBJ_BASE)/include/$(ARCH)/l4/dde/linux26 \
- $(OBJ_BASE)/include/l4/dde/linux26
+MY_DDE_INCDIR = $(OBJ_BASE)/include/$(ARCH) \
+ $(OBJ_BASE)/include/
SUFFIX_amd64 = x86_64
SUFFIX_x86 = x86
SUFFIX_arm = arm
-MY_LINUX26_INCDIR = $(OBJ_BASE)/include/$(ARCH)/l4/dde/linux26/linux-headers \
- $(OBJ_BASE)/include/$(ARCH)/l4/dde/linux26/asm \
- $(OBJ_BASE)/include/l4/dde/linux26/linux-headers
+MY_LINUX26_INCDIR = $(OBJ_BASE)/include/$(ARCH)/linux-headers \
+ $(OBJ_BASE)/include/$(ARCH)/asm \
+ $(OBJ_BASE)/include/linux-headers/asm \
+ $(OBJ_BASE)/include/linux-headers
# stolen from fiasco/src/Makeconf, checks whether a compiler supports a certain
# parameter
@@ -36,10 +39,10 @@ L4_MULTITHREADED = y
# arch-specific stuff
ifeq ($(ARCH), x86)
-MY_DDE_INCDIR += $(OBJ_BASE)/include/l4/dde/linux26/linux-headers/asm/mach-default
+MY_DDE_INCDIR += $(OBJ_BASE)/include/linux-headers/asm/mach-default
endif
-PRIVATE_INCDIR += $(MY_DDE_INCDIR) $(MY_LINUX26_INCDIR)
+PRIVATE_INCDIR += $(MY_DDE_INCDIR) $(MY_LINUX26_INCDIR) /root/hurd/libddekit/include
DEFINES += -D__KERNEL__ -DDDE_LINUX $(KBUILD_DEFINES)
CPPFLAGS += $(KBUILD_CPPFLAGS)
diff --git a/libdde_linux26/contrib/arch/x86/include/Makefile b/libdde_linux26/contrib/arch/x86/include/Makefile
index 665e84a2..92d41a6d 100644
--- a/libdde_linux26/contrib/arch/x86/include/Makefile
+++ b/libdde_linux26/contrib/arch/x86/include/Makefile
@@ -2,7 +2,7 @@ PKGDIR ?= ../../../..
L4DIR ?= $(PKGDIR)
# Force these include files to appear in a special subfolder of dde/
-INSTALL_INC_PREFIX = l4/dde/linux26/linux-headers/
+INSTALL_INC_PREFIX = linux-headers/
include $(L4DIR)/mk/include.mk
diff --git a/libdde_linux26/include/Makefile b/libdde_linux26/include/Makefile
index 7584d036..2ac8b949 100644
--- a/libdde_linux26/include/Makefile
+++ b/libdde_linux26/include/Makefile
@@ -2,9 +2,9 @@ PKGDIR ?= ..
L4DIR ?= $(PKGDIR)
# Force these include files to appear in a special subfolder of dde/
-INSTALL_INC_PREFIX = l4/dde/linux26
+INSTALL_INC_PREFIX =
-#include $(L4DIR)/mk/Makeconf
+include $(L4DIR)/mk/Makeconf
-include $(PKGDIR_OBJ)/Makeconf
include $(L4DIR)/mk/include.mk
@@ -18,6 +18,7 @@ SUFFIX_arm = arm
# macro to establish a symlink to a dir if not already existing
MAKELINK = if [ ! $1 -ef $2 ] ; then ln -sf $3 $2 ; fi
+BUILD_ARCH = x86
ARCH = $(BUILD_ARCH)
all::
diff --git a/libdde_linux26/mk/Makeconf b/libdde_linux26/mk/Makeconf
index 5a1e495c..4f377875 100644
--- a/libdde_linux26/mk/Makeconf
+++ b/libdde_linux26/mk/Makeconf
@@ -31,6 +31,9 @@
ifeq ($(origin _L4DIR_MK_MAKECONF),undefined)
_L4DIR_MK_MAKECONF=y
+SYSTEMS = x86-l4v2
+ARCH = x86
+
# the default target is all
all::
@@ -230,7 +233,7 @@ VPATH_SRC_BASE ?= $(SRC_DIR)
MAKECONFLOCAL ?= Makeconf.local
-include $(MAKECONFLOCAL)
-DROPS_STDDIR ?= /home/drops
+DROPS_STDDIR ?= /root/hurd/libdde_linux26/build
ifeq ($(STATICFILE),)
STATICFILE = $(OBJ_BASE)/pkg/STATIC $(L4DIR)/pkg/STATIC
endif
@@ -320,8 +323,8 @@ ifeq ($(USE_DIETLIBC),y)
$(warning Dietlibc will soon be removed from the tree.)
else
# uClibc explicitly set for all architectures
- DEFINES += -DUSE_UCLIBC=y
- USE_UCLIBC = y
+ DEFINES += #-DUSE_UCLIBC=y
+ USE_UCLIBC = #y
LIBC_TYPE = uc
endif
diff --git a/libdde_linux26/mk/binary.inc b/libdde_linux26/mk/binary.inc
index 14da70a9..6525d1e6 100644
--- a/libdde_linux26/mk/binary.inc
+++ b/libdde_linux26/mk/binary.inc
@@ -155,11 +155,11 @@ all:: $(TARGET)
disasm: $(TARGET)
$(call DISASM_CMD,$<)
-L4INCDIR ?= $(addprefix $(OBJ_BASE)/include/$(ARCH)/,$(L4API)) \
- $(addprefix $(OBJ_BASE)/include/,$(L4API)) \
- $(OBJ_BASE)/include/$(ARCH) \
+L4INCDIR ?= $(OBJ_BASE)/include/$(ARCH) \
$(OBJ_BASE)/include \
- $(DICE_INCDIR) \
+# $(addprefix $(OBJ_BASE)/include/$(ARCH)/,$(L4API)) \
+# $(addprefix $(OBJ_BASE)/include/,$(L4API)) \
+# $(DICE_INCDIR) \
$(addprefix $(DROPS_STDDIR)/include/$(ARCH)/,$(L4API)) \
$(addprefix $(DROPS_STDDIR)/include/,$(L4API)) \
$(DROPS_STDDIR)/include/$(ARCH) \
@@ -291,14 +291,20 @@ endif
endif
CPPFLAGS+= $(CPPFLAGS_$(OSYSTEM)) $(CPPFLAGS_$(<F)) $(CPPFLAGS_$(<F)_$(OSYSTEM))
+# defined in mk/Makeconf and this file.
CPPFLAGS+= $(DEFINES)
CPPFLAGS+= $(BID_CPPFLAGS_SYSCALLS)
CPPFLAGS+= $(addprefix -I, $(PRIVATE_INCDIR) $(PRIVATE_INCDIR_$(OSYSTEM)) $(PRIVATE_INCDIR_$@) $(PRIVATE_INCDIR_$@_$(OSYSTEM)))
-CPPFLAGS+= $(if $(CLIENTIDL)$(SERVERIDL)$(addprefix CLIENTIDL_,$(TARGET))$(addprefix SERVERIDL_,$(TARGET)),$(addprefix -I, $(IDL_PATH)))
+CPPFLAGS+= -I.
+#CPPFLAGS+= $(if $(CLIENTIDL)$(SERVERIDL)$(addprefix CLIENTIDL_,$(TARGET))$(addprefix SERVERIDL_,$(TARGET)),$(addprefix -I, $(IDL_PATH)))
ifneq ($(MODE),host)
CPPFLAGS+= $(addprefix -I, $(L4INCDIR))
endif
CPPFLAGS+= $(LIBCINCDIR)
+#CPPFLAGS+= -I/root/hurd/libddekit/include
+#CPPFLAGS+= -I/root/hurd/libdde_linux26/include
+#CPPFLAGS+= -I/root/hurd/libdde_linux26/contrib/include
+#CPPFLAGS+= -I/root/hurd/libdde_linux26/contrib/arch/x86/include
CXXFLAGS+= $(BID_CFLAGS_GSTAB) $(BID_CFLAGS_OMIT_FP)
CXXFLAGS+= $(CXXFLAGS_$(OSYSTEM))
diff --git a/libdde_linux26/mk/include.mk b/libdde_linux26/mk/include.mk
index 3e325cd4..4725374b 100644
--- a/libdde_linux26/mk/include.mk
+++ b/libdde_linux26/mk/include.mk
@@ -34,7 +34,7 @@ endif
INSTALL_INC_PREFIX ?= l4/$(PKGNAME)
INCSRC_DIR ?= $(SRC_DIR)
-#include $(L4DIR)/mk/Makeconf
+include $(L4DIR)/mk/Makeconf
$(GENERAL_D_LOC): $(L4DIR)/mk/include.mk
-include $(DEPSVAR)
diff --git a/libdde_linux26/mk/modes.inc b/libdde_linux26/mk/modes.inc
index d39d07f6..5cb1ef77 100644
--- a/libdde_linux26/mk/modes.inc
+++ b/libdde_linux26/mk/modes.inc
@@ -31,14 +31,14 @@ else
LDS_LOADER = $(LDS_DEFAULT)
endif
-LIBC_INCLUDE = -nostdinc \
- -I$(OBJ_BASE)/include/$(ARCH)/uclibc \
- -I$(OBJ_BASE)/include/uclibc \
- -I$(OBJ_BASE)/include/uclibc++ \
- -I$(DROPS_STDDIR)/include/$(ARCH)/uclibc \
- -I$(DROPS_STDDIR)/include/uclibc \
- -I$(DROPS_STDDIR)/include/uclibc++ \
- $(I_GCCINCDIR)
+#LIBC_INCLUDE = -nostdinc
+# -I$(OBJ_BASE)/include/$(ARCH)/uclibc \
+# -I$(OBJ_BASE)/include/uclibc \
+# -I$(OBJ_BASE)/include/uclibc++ \
+# -I$(DROPS_STDDIR)/include/$(ARCH)/uclibc \
+# -I$(DROPS_STDDIR)/include/uclibc \
+# -I$(DROPS_STDDIR)/include/uclibc++ \
+# $(I_GCCINCDIR)
LIBC_LIB = -luc_c
#############################################################################
generated by cgit v1.2.3 (git 2.46.0) at 2025-04-20 13:43:02 +0000