From 48f811cc53949e3b15951a1dee2be21ec93d690b Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 3 Aug 2025 19:37:31 +0200 Subject: [PATCH 1/2] re-isearch: 2.20220925.4.0a-unstable-2025-03-16 -> 2.20220925.4.0a-unstable-2025-05-15 --- ...fix-JsonHitTable-undefined-reference.patch | 50 --------------- .../1001-Fix-resurcive-make-parallelism.patch | 64 +++++++++++++++++++ pkgs/by-name/re/re-isearch/package.nix | 28 ++++---- 3 files changed, 80 insertions(+), 62 deletions(-) delete mode 100644 pkgs/by-name/re/re-isearch/0001-fix-JsonHitTable-undefined-reference.patch create mode 100644 pkgs/by-name/re/re-isearch/1001-Fix-resurcive-make-parallelism.patch diff --git a/pkgs/by-name/re/re-isearch/0001-fix-JsonHitTable-undefined-reference.patch b/pkgs/by-name/re/re-isearch/0001-fix-JsonHitTable-undefined-reference.patch deleted file mode 100644 index 30b8696b70d8..000000000000 --- a/pkgs/by-name/re/re-isearch/0001-fix-JsonHitTable-undefined-reference.patch +++ /dev/null @@ -1,50 +0,0 @@ -# fixes "undefined reference to `IDB::JsonHitTable(RESULT const&)" build failure - ---- - src/idb.cxx | 26 -------------------------- - 1 file changed, 26 deletions(-) - -diff --git a/src/idb.cxx b/src/idb.cxx -index 2469c06..753a9fb 100644 ---- a/src/idb.cxx -+++ b/src/idb.cxx -@@ -5486,37 +5486,11 @@ STRING IDB::XMLHitTable(const RESULT& Result) - } - #endif - --#if 0 - STRING IDB::JsonHitTable(const RESULT& Result) - { --#if 1 - message_log (LOG_FATAL, "JsonHitTable is not yet implemented"); - return NulString; --#else --/* -- -- Shopping -- -- --is JSON -- --{ -- "folders": { -- "folder":{ -- "@": { -- "id": "123", -- "private": "0", -- "archived": "0", -- "order": "1" -- }, -- "#": "Shopping" -- } -- } --} --*/ - } --#endif --#endif - - - PIRSET IDB::SearchSmart(QUERY *Query, const STRING& DefaultField) --- -2.47.2 diff --git a/pkgs/by-name/re/re-isearch/1001-Fix-resurcive-make-parallelism.patch b/pkgs/by-name/re/re-isearch/1001-Fix-resurcive-make-parallelism.patch new file mode 100644 index 000000000000..1d6720550a40 --- /dev/null +++ b/pkgs/by-name/re/re-isearch/1001-Fix-resurcive-make-parallelism.patch @@ -0,0 +1,64 @@ +From 9fc97ea817762e2575954cd31aa735b2cfec7a5e Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Sun, 3 Aug 2025 19:08:30 +0200 +Subject: [PATCH] build/Makefile: Fix recursive make & parallelism + +- Recursively calling make should be done by using the special `MAKE` variable, which will preserve parallelism across calls +- Don't hardcode parallelism in recursive make calls, inherit user-supplied ones instead +--- + build/Makefile | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/build/Makefile b/build/Makefile +index 6633ebd..807bfd9 100644 +--- a/build/Makefile ++++ b/build/Makefile +@@ -2,36 +2,36 @@ UNAME := $(shell uname) + + all: + ifeq ($(UNAME), Darwin) +- make -j 5 -f Makefile.MacOS-OMP $(MFLAGS) ++ $(MAKE) -f Makefile.MacOS-OMP $(MFLAGS) + endif + ifeq ($(UNAME), Linux) +- make -j 3 -f Makefile.ubuntu $(MFLAGS) ++ $(MAKE) -f Makefile.ubuntu $(MFLAGS) + endif + ifeq ($(UNAME), Solaris) +- make -f Makefile.solaris $(MFLAGS) ++ $(MAKE) -f Makefile.solaris $(MFLAGS) + endif + + install: + ifeq ($(UNAME), Darwin) +- make -j 5 -f Makefile.MacOS-OMP $(MFLAGS) install ++ $(MAKE) -f Makefile.MacOS-OMP $(MFLAGS) install + endif + ifeq ($(UNAME), Linux) +- make -j 3 -f Makefile.ubuntu $(MFLAGS) install ++ $(MAKE) -f Makefile.ubuntu $(MFLAGS) install + endif + ifeq ($(UNAME), Solaris) +- make -f Makefile.solaris $(MFLAGS) install ++ $(MAKE) -f Makefile.solaris $(MFLAGS) install + endif + + + plugins: + ifeq ($(UNAME), Darwin) +- make -j 5 -f Makefile.MacOS $(MFLAGS) plugins ++ $(MAKE) -f Makefile.MacOS $(MFLAGS) plugins + endif + ifeq ($(UNAME), Linux) +- make -j 3 -f Makefile.ubuntu $(MFLAGS) plugins ++ $(MAKE) -f Makefile.ubuntu $(MFLAGS) plugins + endif + ifeq ($(UNAME), Solaris) +- make -f Makefile.solaris $(MFLAGS) plugins ++ $(MAKE) -f Makefile.solaris $(MFLAGS) plugins + endif + + +-- +2.50.1 + diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix index b0e1e1c9e810..6e3c26db8d30 100644 --- a/pkgs/by-name/re/re-isearch/package.nix +++ b/pkgs/by-name/re/re-isearch/package.nix @@ -11,24 +11,27 @@ stdenv.mkDerivation { pname = "re-Isearch"; - version = "2.20220925.4.0a-unstable-2025-03-16"; + version = "2.20220925.4.0a-unstable-2025-05-15"; src = fetchFromGitHub { owner = "re-Isearch"; repo = "re-Isearch"; - rev = "56e0dfbe7468881b3958ca8e630f41a5354e9873"; - hash = "sha256-tI75D02/sFEkHDQX/BpDlu24WNP6Qh9G0MIfEvs8npM="; + rev = "35e939fd60948f112b668b06d2b8b75f2c7425d3"; + hash = "sha256-r7KUwx2SrfnpSknGSpzw33Qwp63htoKknrnmdOgA/9Y="; }; - # Upstream issue: https://github.com/re-Isearch/re-Isearch/issues/11 - patches = [ ./0001-fix-JsonHitTable-undefined-reference.patch ]; + patches = [ + # https://github.com/re-Isearch/re-Isearch/pull/12 + ./1001-Fix-resurcive-make-parallelism.patch + ]; postPatch = '' # Fix gcc-13 build due to missing include. + # https://github.com/re-Isearch/re-Isearch/pull/13 sed -e '1i #include ' -i src/mmap.cxx - # g++: error: unrecognized command-line option '-msse2' - # gcc: error: unrecognized command-line option '-m64' + # These flags are not supported on all architectures + # https://github.com/re-Isearch/re-Isearch/issues/14 substituteInPlace build/Makefile.ubuntu \ --replace-fail "-msse2" "" \ --replace-fail "-m64" "" @@ -43,20 +46,21 @@ stdenv.mkDerivation { ]; makeFlags = [ - "CC=g++" - "cc=gcc" - "LD=g++" + "CC=${stdenv.cc.targetPrefix}c++" + "cc=${stdenv.cc.targetPrefix}cc" + "LD=${stdenv.cc.targetPrefix}c++" ]; preBuild = '' cd build - make clean # clean up pre-built objects in the source makeFlagsArray+=( - EXTRA_INC="-I${db.dev}/include -I${lib.getDev file}/include" + EXTRA_INC="-I${lib.getDev db}/include -I${lib.getDev file}/include" LD_PATH="-L../lib -L${db.out}/lib -L${file}/lib -L${libnsl}/lib" ) ''; + enableParallelBuilding = true; + installPhase = '' runHook preInstall From f3da09dfef69b458fae8d4004d34d3c600cc7edb Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 3 Aug 2025 20:22:37 +0200 Subject: [PATCH 2/2] re-isearch: Disable enableParallelBuilding again Do so explicitly, and add a note about why. --- pkgs/by-name/re/re-isearch/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix index 6e3c26db8d30..23326ab144a4 100644 --- a/pkgs/by-name/re/re-isearch/package.nix +++ b/pkgs/by-name/re/re-isearch/package.nix @@ -59,7 +59,10 @@ stdenv.mkDerivation { ) ''; - enableParallelBuilding = true; + # Handwritten Makefiles, doesn't properly ensure that libraries are built before they're used in linking + # ld: cannot find -libUtils: No such file or directory + # ld: cannot find -libLocal: No such file or directory + enableParallelBuilding = false; installPhase = '' runHook preInstall