dde_rump: migrate to new ports mechanism

Issue #1082
This commit is contained in:
Josef Söntgen
2014-05-23 17:54:04 +02:00
committed by Norman Feske
parent db89c85954
commit 9e443c78db
5 changed files with 48 additions and 60 deletions

View File

@@ -4,9 +4,9 @@
# \date 2013-12-12
#
CONTRIB_DIR = $(REP_DIR)/contrib
RUMP_BASE = $(BUILD_BASE_DIR)/var/libcache/rump
RUMP_LIB = $(RUMP_BASE)/lib
RUMP_CONTRIB_DIR := $(call select_from_ports,dde_rump)/src/lib/dde_rump
RUMP_BASE = $(BUILD_BASE_DIR)/var/libcache/rump
RUMP_LIB = $(RUMP_BASE)/lib
SHARED_LIB = yes

View File

@@ -3,7 +3,7 @@ include $(REP_DIR)/lib/mk/rump.inc
include $(REP_DIR)/lib/import/import-rump.mk
RUMP_OBJ = $(RUMP_BASE)/obj
RUMP_SRC = $(CONTRIB_DIR)/src
RUMP_SRC = $(RUMP_CONTRIB_DIR)/src
RUMP_TOOLS = $(RUMP_BASE)/tools
RMAKE = $(RUMP_TOOLS)/rumpmake
@@ -26,7 +26,7 @@ SOURCE = $(addprefix $(REP_DIR)/src/lib/rump/,$(SRC_CC))
# Rump build script
#
BUILD_CMD = AR=$(AR) NM=$(NM) OBJCOPY=$(OBJCOPY) \
$(CONTRIB_DIR)/buildrump.sh -k -V'MAKEVERBOSE=$(VERBOSE_LEVEL)' \
$(RUMP_CONTRIB_DIR)/buildrump.sh -k -V'MAKEVERBOSE=$(VERBOSE_LEVEL)' \
$(RUMP_OPT) -s $(RUMP_SRC) -T $(RUMP_TOOLS) -o $(RUMP_OBJ) \
-d $(RUMP_BASE)
@@ -83,8 +83,8 @@ $(RUMP_BASE)/include/.prepared: $(ARCHIVE)
@cd $(RUMP_SRC)/sys; $(RMAKE) -k obj >/dev/null 2>&1
@cd $(RUMP_SRC)/sys; $(RMAKE) -k includes >/dev/null 2>&1
@cd $(RUMP_SRC)/include; $(RMAKE) -k includes > /dev/null 2>&1
@cd $(CONTRIB_DIR)/nblibs/lib/libc; $(RMAKE) includes >/dev/null 2>&1
@cd $(CONTRIB_DIR)/nblibs/lib/libpthread; $(RMAKE) includes >/dev/null 2>&1
@cd $(RUMP_CONTRIB_DIR)/nblibs/lib/libc; $(RMAKE) includes
@cd $(RUMP_CONTRIB_DIR)/nblibs/lib/libpthread; $(RMAKE) includes >/dev/null 2>&1
@touch $(RUMP_BASE)/include/.prepared
#