Move Makefile fix into flake.nix patch

panda-re · Dec 19, 2023 · be17e66 · be17e66
1 parent 7153151
commit be17e66
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -653,6 +653,7 @@ newtoobig=$(shell oldrp="$(rppart)" ; oldrplen=`expr $${$(number_sign)oldrp} - 6
 endif
 
 install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir
+ifeq ($(newtoobig), false)
 ifneq ($(TOOLS),)
 	$(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir))
 endif
@@ -683,6 +684,9 @@ endif
 	for d in $(TARGET_DIRS); do \
 	$(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \
         done
+else
+	$(error new RPATH too long - cannot adjust .so files for installation)
+endif
 
 # various test targets
 test speed: all

diff --git a/flake.nix b/flake.nix
@@ -74,6 +74,32 @@
           ++ (with pkgs.python3Packages; [ pycparser libfdt ]);
         nativeBuildInputs = [ pkgs.rustPlatform.cargoSetupHook ];
         enableParallelBuilding = true;
+        patches = [
+          (pkgs.writeText "fix-rpath-error.patch" ''
+            diff --git a/Makefile b/Makefile
+            index cc2064de42..8b357e9a9a 100644
+            --- a/Makefile
+            +++ b/Makefile
+            @@ -653,7 +653,6 @@ newtoobig=$(shell oldrp="$(rppart)" ; oldrplen=`expr $''${$(number_sign)oldrp} - 6
+             endif
+
+             install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir
+            -ifeq ($(newtoobig), false)
+             ifneq ($(TOOLS),)
+             	$(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir))
+             endif
+            @@ -684,9 +683,6 @@ endif
+             	for d in $(TARGET_DIRS); do \
+             	$(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \
+                     done
+            -else
+            -	$(error new RPATH too long - cannot adjust .so files for installation)
+            -endif
+
+             # various test targets
+             test speed: all
+          '')
+        ];
         postPatch = ''
           patchShebangs .
           substituteInPlace rules.mak \