guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 61135013270b402fa3f65695cc09e034133fcf8c
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Thu Oct 30 16:19:55 2025 +0900
Revert "gnu: flex: Apply a patch fixing a non-deterministic build failure."
This reverts commit 6faa102a045bde3eaedf9b6f9076be70abbe890e.
---
gnu/local.mk | 1 -
gnu/packages/flex.scm | 21 ++++-----
.../patches/flex-fix-make-dependencies.patch | 54 ----------------------
3 files changed, 9 insertions(+), 67 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index a6bc8db5e2..abedd37ff7 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1290,7 +1290,6 @@ dist_patch_DATA =
\
%D%/packages/patches/flatpak-fix-fonts-icons.patch \
%D%/packages/patches/flatpak-fix-icon-validation.patch \
%D%/packages/patches/flatpak-unset-gdk-pixbuf-for-sandbox.patch \
- %D%/packages/patches/flex-fix-make-dependencies.patch \
%D%/packages/patches/fluxbox-1.3.7-no-dynamic-cursor.patch \
%D%/packages/patches/fluxbox-1.3.7-gcc.patch \
%D%/packages/patches/fmt-9-overspecified-tests.patch \
diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm
index 45ee7e7eaf..bc4498b633 100644
--- a/gnu/packages/flex.scm
+++ b/gnu/packages/flex.scm
@@ -26,7 +26,6 @@
#:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (gnu packages)
- #:use-module (gnu packages bootstrap)
#:use-module (gnu packages m4)
#:use-module (gnu packages man)
#:use-module (gnu packages bison)
@@ -36,17 +35,15 @@
(package
(name "flex")
(version "2.6.4")
- (source (bootstrap-origin ;avoid a circular dependency
- (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/westes/flex";
- "/releases/download/v" version "/"
- "flex-" version ".tar.gz"))
- (sha256
- (base32
- "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8"))
- (patches (search-patches "flex-fix-make-dependencies.patch")))))
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/westes/flex";
+ "/releases/download/v" version "/"
+ "flex-" version ".tar.gz"))
+ (sha256
+ (base32
+ "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8"))))
(build-system gnu-build-system)
(inputs
(let ((bison-for-tests
diff --git a/gnu/packages/patches/flex-fix-make-dependencies.patch
b/gnu/packages/patches/flex-fix-make-dependencies.patch
deleted file mode 100644
index dbe9392a26..0000000000
--- a/gnu/packages/patches/flex-fix-make-dependencies.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Retrieved from Poky:
-https://git.enea.com/cgit/linux/poky.git/plain/meta/recipes-devtools/flex/flex/0001-build-tests-add-missing-parser-scanner-dependencies.patch?id=bf94ea1cc4e966fa2cf55206389f9c34fbd5419d
-
-From 47e3916842ffefd7def84ae85758fdcceeb77839 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Thu, 20 Mar 2025 12:16:50 +0000
-Subject: [PATCH] build(tests): add missing parser->scanner dependencies
-
-With sufficient parallelism and `make --shuffle` to reorder builds the
-test suite occasionally fails to build with errors like this:
-
- tests/bison_yylval_parser.y:36:10: fatal error: bison_yylval_scanner.h: No
such file or directory
- 36 | #include "bison_yylval_scanner.h"
-
-Solve this by adding the missing dependencies to the *_parser.o targets
-on the _scanner.h files.
-
-Upstream-Status: Submitted [https://github.com/westes/flex/pull/702]
-Signed-off-by: Ross Burton <[email protected]>
----
- tests/Makefile.am | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 2cb51df..d0c199d 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -343,6 +343,7 @@ FLEX = $(top_builddir)/src/flex
-
- bison_nr_main.$(OBJEXT): bison_nr_parser.h bison_nr_scanner.h
- bison_nr_scanner.$(OBJEXT): bison_nr_parser.h
-+bison_nr_parser.$(OBJEXT): bison_nr_scanner.h
-
- bison_nr_scanner.h: bison_nr_scanner.c
- @if test ! -f $@; then rm -f $<; else :; fi
-@@ -350,6 +351,7 @@ bison_nr_scanner.h: bison_nr_scanner.c
-
- bison_yylloc_main.$(OBJEXT): bison_yylloc_parser.h bison_yylloc_scanner.h
- bison_yylloc_scanner.$(OBJEXT): bison_yylloc_parser.h
-+bison_yylloc_parser.$(OBJEXT): bison_yylloc_scanner.h
-
- bison_yylloc_scanner.h: bison_yylloc_scanner.c
- @if test ! -f $@; then rm -f $<; else :; fi
-@@ -357,6 +359,7 @@ bison_yylloc_scanner.h: bison_yylloc_scanner.c
-
- bison_yylval_main.$(OBJEXT): bison_yylval_parser.h bison_yylval_scanner.h
- bison_yylval_scanner.$(OBJEXT): bison_yylval_parser.h
-+bison_yylval_parser.$(OBJEXT): bison_yylval_scanner.h
-
- bison_yylval_scanner.h: bison_yylval_scanner.c
- @if test ! -f $@; then rm -f $<; else :; fi
---
-2.43.0
-
