From 7f3cdfd2ba5a05a2d413c2cd9c421a4b0a28ac94 Mon Sep 17 00:00:00 2001
From: Tero Tervala <tero.tervala@unikie.com>
Date: Wed, 18 May 2022 16:14:01 +0300
Subject: [PATCH] dtc: fix static building

---
 ...-instead-of-.so-when-building-static.patch | 90 +++++++++++++++++++
 pkgs/development/compilers/dtc/default.nix    |  5 +-
 2 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/dtc/0001-Depend-on-.a-instead-of-.so-when-building-static.patch

diff --git a/pkgs/development/compilers/dtc/0001-Depend-on-.a-instead-of-.so-when-building-static.patch b/pkgs/development/compilers/dtc/0001-Depend-on-.a-instead-of-.so-when-building-static.patch
new file mode 100644
index 00000000000..dcc3a08c1ed
--- /dev/null
+++ b/pkgs/development/compilers/dtc/0001-Depend-on-.a-instead-of-.so-when-building-static.patch
@@ -0,0 +1,90 @@
+From c1d426bdd477ffeb3dfa03501de089a341b85d0b Mon Sep 17 00:00:00 2001
+From: Tero Tervala <tero.tervala@unikie.com>
+Date: Wed, 15 Jun 2022 13:44:55 +0300
+Subject: [PATCH] Depend on .a instead of .so when building static
+
+Static build needs to be indicated with environment variable:
+STATIC_BUILD=1
+
+Checks are skipped on static builds
+
+Signed-off-by: Tero Tervala <tero.tervala@unikie.com>
+---
+ Makefile             | 12 +++++++++---
+ tests/Makefile.tests | 11 ++++++++---
+ 2 files changed, 17 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ee77115..9f550b4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -198,6 +198,12 @@ LIBFDT_lib = $(LIBFDT_dir)/$(LIBFDT_LIB)
+ LIBFDT_include = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_INCLUDES))
+ LIBFDT_version = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_VERSION))
+ 
++ifeq ($(STATIC_BUILD),1)
++	LIBFDT_dep = $(LIBFDT_archive)
++else
++	LIBFDT_dep = $(LIBFDT_lib)
++endif
++
+ include $(LIBFDT_dir)/Makefile.libfdt
+ 
+ .PHONY: libfdt
+@@ -261,11 +267,11 @@ convert-dtsv0: $(CONVERT_OBJS)
+ 
+ fdtdump:	$(FDTDUMP_OBJS)
+ 
+-fdtget:	$(FDTGET_OBJS) $(LIBFDT_lib)
++fdtget:	$(FDTGET_OBJS) $(LIBFDT_dep)
+ 
+-fdtput:	$(FDTPUT_OBJS) $(LIBFDT_lib)
++fdtput:	$(FDTPUT_OBJS) $(LIBFDT_dep)
+ 
+-fdtoverlay: $(FDTOVERLAY_OBJS) $(LIBFDT_lib)
++fdtoverlay: $(FDTOVERLAY_OBJS) $(LIBFDT_dep)
+ 
+ dist:
+ 	git archive --format=tar --prefix=dtc-$(dtc_version)/ HEAD \
+diff --git a/tests/Makefile.tests b/tests/Makefile.tests
+index 2f78952..f13b16d 100644
+--- a/tests/Makefile.tests
++++ b/tests/Makefile.tests
+@@ -60,17 +60,17 @@ TESTS_CLEANDIRS = $(TESTS_CLEANDIRS_L:%=$(TESTS_PREFIX)%)
+ .PHONY: tests
+ tests:	$(TESTS) $(TESTS_TREES)
+ 
+-$(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_lib)
++$(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_dep)
+ 
+ # Not necessary on all platforms; allow -ldl to be excluded instead of forcing
+ # other platforms to patch it out.
+ LIBDL = -ldl
+-$(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_lib)
++$(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_dep)
+ 	@$(VECHO) LD [libdl] $@
+ 	$(LINK.c) -o $@ $^ $(LIBDL)
+ 
+ $(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o \
+-		util.o $(LIBFDT_lib)
++		util.o $(LIBFDT_dep)
+ 
+ $(TESTS_PREFIX)dumptrees: $(TESTS_PREFIX)trees.o
+ 
+@@ -83,8 +83,13 @@ tests_clean:
+ 	rm -f $(TESTS_CLEANFILES)
+ 	rm -rf $(TESTS_CLEANDIRS)
+ 
++ifeq ($(STATIC_BUILD),1)
++check:
++	@echo Skipping checks for static build
++else
+ check:	tests ${TESTS_BIN} $(TESTS_PYLIBFDT)
+ 	cd $(TESTS_PREFIX); ./run_tests.sh
++endif
+ 
+ ifeq ($(NO_VALGRIND),1)
+ checkm:
+-- 
+2.33.3
+
diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix
index 78290cfc423..d3edb3936d6 100644
--- a/pkgs/development/compilers/dtc/default.nix
+++ b/pkgs/development/compilers/dtc/default.nix
@@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
     # based on without requiring the setup.py rework
     # https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=383e148b70a47ab15f97a19bb999d54f9c3e810f
     ./python-3.10.patch
+
+    # fix dtc static building
+    ./0001-Depend-on-.a-instead-of-.so-when-building-static.patch
   ];
 
   nativeBuildInputs = [ flex bison pkg-config which ]
@@ -38,7 +41,7 @@ stdenv.mkDerivation rec {
     patchShebangs pylibfdt/
   '';
 
-  makeFlags = [ "PYTHON=python" ];
+  makeFlags = [ "PYTHON=python" "STATIC_BUILD=${toString stdenv.hostPlatform.isStatic}" ];
   installFlags = [ "INSTALL=install" "PREFIX=$(out)" "SETUP_PREFIX=$(out)" ];
 
   # Checks are broken on aarch64 darwin