From 0c1f727871c455ed74a7b86b5cf38cc32dc2f34f Mon Sep 17 00:00:00 2001
From: Michael Mueller <michael.mueller@uos.de>
Date: Mon, 11 Jul 2022 11:59:11 +0200
Subject: [PATCH] Working mxtasking port

---
 repos/libports/lib/mk/mxtasking.mk              | 12 +++++++-----
 repos/libports/ports/mxtasking.hash             |  2 +-
 repos/libports/ports/mxtasking.port             |  3 +--
 repos/libports/recipes/src/mxtasking/content.mk |  9 ++++++---
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/repos/libports/lib/mk/mxtasking.mk b/repos/libports/lib/mk/mxtasking.mk
index 7587beb175..f78b4f5d97 100644
--- a/repos/libports/lib/mk/mxtasking.mk
+++ b/repos/libports/lib/mk/mxtasking.mk
@@ -1,17 +1,19 @@
 MXTASKING_DIR := $(call select_from_ports,mxtasking)/src/lib/mxtasking
 
+SRC_CC = $(shell find $(MXTASKING_DIR)/src/mx -name '*.cpp')
 vpath %.cpp $(MXTASKING_DIR)/src/mx
 
-INC_DIR += $(MXTASKING_DIR)/src/mx $(MXTASKING_DIR)/lib
+INC_DIR += $(MXTASKING_DIR)/src $(MXTASKING_DIR)/lib
 vpath %.h ${INC_DIR}
 
-CC_OPT += -pedantic -Wall -Wextra -Werror \
+CC_OPT += -pedantic -Wall \
  -Wno-invalid-offsetof -Wcast-align -Wcast-qual -Wctor-dtor-privacy -Wdisabled-optimization \
  -Wformat=2 -Winit-self -Wmissing-declarations -Wmissing-include-dirs -Woverloaded-virtual \
  -Wredundant-decls -Wshadow -Wsign-promo -Wstrict-overflow=5 -Wswitch-default -Wundef \
- -Wno-unused -Wold-style-cast -Wno-uninitialized -O1 -g3
+ -Wno-unused -Wold-style-cast -Wno-uninitialized -O1 -g3 -fno-aligned-new
 
 CC_OPT += $(addprefix -I ,$(INC_DIR))
+CC_CXX_WARN_STRICT =
 
-LIBS += libm libc stdcxx
-SHARED_LIB = yes
\ No newline at end of file
+LIBS += base libm libc stdcxx
+#SHARED_LIB = yes
diff --git a/repos/libports/ports/mxtasking.hash b/repos/libports/ports/mxtasking.hash
index 5e66831d75..a8f4744d93 100644
--- a/repos/libports/ports/mxtasking.hash
+++ b/repos/libports/ports/mxtasking.hash
@@ -1 +1 @@
-7a929fd5688f43e14fa1b3e51ef86221e49746af
+e4d5a5f37a34715b9d48ec455aa0b6c26fe34553
diff --git a/repos/libports/ports/mxtasking.port b/repos/libports/ports/mxtasking.port
index d861450d97..61948e64d9 100644
--- a/repos/libports/ports/mxtasking.port
+++ b/repos/libports/ports/mxtasking.port
@@ -3,7 +3,7 @@ DOWNLOADS := mxtasking.git
 VERSION := git
 
 URL(mxtasking) := https://github.com/mmueller41/mxtasking.git
-REV(mxtasking) := ef10d021120a024ecf07f21590f97c5acdb647bc
+REV(mxtasking) := e734ffd0d824634818fe30b356632501b7956595 
 DIR(mxtasking) := src/lib/mxtasking
 
 DIRS += include/mx/memory
@@ -45,7 +45,6 @@ DIR_CONTENT(include/mx/system) += src/lib/mxtasking/src/mx/system/builtin.h
 DIR_CONTENT(include/mx/system) += src/lib/mxtasking/src/mx/system/cpuid.h
 DIR_CONTENT(include/mx/system) += src/lib/mxtasking/src/mx/system/cache.h
 DIR_CONTENT(include/mx/system) += src/lib/mxtasking/src/mx/system/environment.h
-DIR_CONTENT(include/mx/system) += src/lib/mxtasking/src/mx/system/thread.h
 DIR_CONTENT(include/mx/system) += src/lib/mxtasking/src/mx/system/topology.h
 DIR_CONTENT(include/mx/resource) += src/lib/mxtasking/src/mx/resource/resource_interface.h
 DIR_CONTENT(include/mx/resource) += src/lib/mxtasking/src/mx/resource/resource.h
diff --git a/repos/libports/recipes/src/mxtasking/content.mk b/repos/libports/recipes/src/mxtasking/content.mk
index 0094c10574..e3fe150c84 100644
--- a/repos/libports/recipes/src/mxtasking/content.mk
+++ b/repos/libports/recipes/src/mxtasking/content.mk
@@ -1,15 +1,18 @@
-content: src/lib/mxtasking lib/mk/mxtasking.mk LICENSE
+MIRROR_FROM_REP_DIR := lib/mk/mxtasking.mk lib/import/import-mxtasking.mk
+
+content: src/lib/mxtasking LICENSE $(MIRROR_FROM_REP_DIR)
 
 PORT_DIR := $(call port_dir,$(REP_DIR)/ports/mxtasking)
 
 src/lib/mxtasking:
 	mkdir -p $@
 	cp -r $(PORT_DIR)/src/lib/mxtasking/* $@
+	rm -rf $@/.git
 	echo "LIBS = mxtasking" > $@/target.mk
 
-lib/mk/mxtasking.mk:
+$(MIRROR_FROM_REP_DIR):
 	$(mirror_from_rep_dir)
 
 LICENSE:
-	echo "mxtsaking license, see src/lib/mxtasking/LICENSE" > $@
+	echo "mxtasking license, see src/lib/mxtasking/LICENSE" > $@