From 220cc8cb6c3dd67cabbf33463ba708d4e379f52f Mon Sep 17 00:00:00 2001 From: Grische Date: Fri, 8 Mar 2024 13:40:20 +0100 Subject: [PATCH] perl: Run make depend to fix build race condition --- ...e-depend-to-fix-build-race-condition.patch | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 patches/perl-Run-make-depend-to-fix-build-race-condition.patch diff --git a/patches/perl-Run-make-depend-to-fix-build-race-condition.patch b/patches/perl-Run-make-depend-to-fix-build-race-condition.patch new file mode 100644 index 00000000..13f09894 --- /dev/null +++ b/patches/perl-Run-make-depend-to-fix-build-race-condition.patch @@ -0,0 +1,64 @@ +From a3f8ba1848bacd77cab402eb2bf147c2365a7690 Mon Sep 17 00:00:00 2001 +From: Christian Schmidbauer +Date: Fri, 8 Mar 2024 13:39:46 +0100 +Subject: [PATCH] perl: Run make depend to fix build race condition + +--- + ...e-depend-to-fix-build-race-condition.patch | 45 +++++++++++++++++++ + 1 file changed, 45 insertions(+) + create mode 100644 patches/openwrt/0016-perl-Run-make-depend-to-fix-build-race-condition.patch + +diff --git a/patches/openwrt/0016-perl-Run-make-depend-to-fix-build-race-condition.patch b/patches/openwrt/0016-perl-Run-make-depend-to-fix-build-race-condition.patch +new file mode 100644 +index 00000000..7b4edbdd +--- /dev/null ++++ b/patches/openwrt/0016-perl-Run-make-depend-to-fix-build-race-condition.patch +@@ -0,0 +1,45 @@ ++From 61d6be29dc678e1a2e9bdb82a94cd30a93977962 Mon Sep 17 00:00:00 2001 ++From: Andreas Gnau ++Date: Tue, 5 Mar 2024 19:30:09 +0100 ++Subject: [PATCH] perl: Run make depend to fix build race condition ++ ++Run make depend before building perl. This fixes parallel build failures ++on machines with a high number of cores. ++ ++Example error 1: ++ ++ /bin/ln -s /build/staging_dir/hostpkg/usr/bin/generate_uudmap generate_uidmap ++ make[5]: ./generate_uudmap: Command not found ++ make[5]: *** [Makefile:321: bitcount.h] Error 127 ++ ++Example error 2: ++ ++ /bin/ln -s /build/staging_dir/hostpkg/usr/bin/generate_uudmap generate_udmap ++ ./generate_uudmap uudmap.h bitcount.h mg_data.h ++ /bin/ln: failed to create symbolic link 'generate_uudmap': File exists ++ make[5]: *** [Makefile:325: generate_uudmap] Error 1 ++ ++Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=996953 ++Link: https://salsa.debian.org/perl-team/interpreter/perl/-/commit/366bc98c916a3455f15c532aa33a5636d2fe2803 ++Closes: https://github.com/openwrt/packages/issues/8238 ++Signed-off-by: Andreas Gnau ++--- ++ lang/perl/Makefile | 2 ++ ++ 1 file changed, 2 insertions(+) ++ ++diff --git a/lang/perl/Makefile b/lang/perl/Makefile ++index afd82997fe..691bcb515f 100644 ++--- a/lang/perl/Makefile +++++ b/lang/perl/Makefile ++@@ -117,6 +117,8 @@ define Build/Configure ++ endef ++ ++ define Build/Compile +++ # make depend is required to avoid race conditions: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=996953 +++ +$(MAKE) -C $(PKG_BUILD_DIR) depend ++ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) ++ endef ++ ++-- ++2.34.1 ++ +-- +2.34.1 +