diff mbox series

[meta-oe,5/6] redis: Do not build the test modules during cross compile

Message ID 20260912235456.2358617-5-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-oe,1/6] openjpeg: fix run-ptest with busybox sed | expand

Commit Message

Khem Raj Sept. 12, 2026, 11:54 p.m. UTC 
src/Makefile's `all` target carries a module_tests prerequisite, which
recurses into tests/modules. That Makefile pins the compiler to whatever
gcc is in PATH:

  # This is a hack to override the default CC. When running with SANITIZER=memory
  # tough we want to keep the compiler as clang as MSan is not supported for gcc
  ifeq ($(uname_S),Linux)
  ifneq ($(SANITIZER),memory)
          LD = gcc
          CC = gcc
  endif
  endif

while still taking CFLAGS/LDFLAGS from the environment, so a cross build
compiles and links all 47 test modules with the build host's gcc using
the target compiler flags. With the gcc toolchain those flags include
-fcanon-prefix-map (DEBUG_PREFIX_MAP_EXTRA in
meta/classes/toolchain/gcc.bbclass), which only exists in GCC >= 13. The
cross compiler always has it, the build host's gcc may not, and the build
then fails:

  | gcc -I../../src -O2 -g -fcanon-prefix-map \
      -ffile-prefix-map=.../sources/redis-8.10.1=/usr/src/debug/redis/8.10.1 \
      ... -std=gnu11 -O2 -fPIC -c commandfilter.c -o commandfilter.xo
  | gcc: error: unrecognized command-line option '-fcanon-prefix-map';
        did you mean '-fmacro-prefix-map='?

The modules are test-only artifacts: nothing links or installs them, and
only the tcl suite that `make test` drives from the build tree consumes
them. Drop them from `all` so no host compiler takes part in the cross
build at all; `test` keeps its own module_tests prerequisite. This has to
happen in the Makefile rather than by naming narrower goals in
do_compile, because `install: all` re-runs the phony target on its own.

With the patch applied the only compiler left in log.do_compile is
${TARGET_PREFIX}gcc, where 47 host gcc compile and 47 host gcc link
invocations used to be.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...-not-build-the-test-modules-from-all.patch | 58 +++++++++++++++++++
 .../recipes-extended/redis/redis_8.10.1.bb    |  1 +
 2 files changed, 59 insertions(+)
 create mode 100644 meta-oe/recipes-extended/redis/redis-8.10.1/0006-src-Makefile-do-not-build-the-test-modules-from-all.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-extended/redis/redis-8.10.1/0006-src-Makefile-do-not-build-the-test-modules-from-all.patch b/meta-oe/recipes-extended/redis/redis-8.10.1/0006-src-Makefile-do-not-build-the-test-modules-from-all.patch
new file mode 100644
index 0000000000..2070faaf75
--- /dev/null
+++ b/meta-oe/recipes-extended/redis/redis-8.10.1/0006-src-Makefile-do-not-build-the-test-modules-from-all.patch
@@ -0,0 +1,58 @@ 
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 12 Sep 2026 09:10:00 -0700
+Subject: [PATCH] src/Makefile: do not build the test modules from `all`
+
+`all` carries a module_tests prerequisite, which recurses into
+../tests/modules. That Makefile deliberately pins the compiler to the
+one found in PATH:
+
+  # This is a hack to override the default CC. When running with SANITIZER=memory
+  # tough we want to keep the compiler as clang as MSan is not supported for gcc
+  ifeq ($(uname_S),Linux)
+  ifneq ($(SANITIZER),memory)
+          LD = gcc
+          CC = gcc
+  endif
+  endif
+
+but it keeps taking CFLAGS/LDFLAGS from the environment. In a cross
+build that combination compiles and links the 47 test modules with the
+*build host* gcc while handing it the *target* compiler flags:
+
+  gcc -I../../src -O2 -g -fcanon-prefix-map \
+      -ffile-prefix-map=.../sources/redis-8.10.1=/usr/src/debug/redis/8.10.1 \
+      ... -fPIC -c commandfilter.c -o commandfilter.xo
+  gcc: error: unrecognized command-line option '-fcanon-prefix-map';
+       did you mean '-fmacro-prefix-map='?
+
+-fcanon-prefix-map only exists in GCC >= 13, and the target toolchain's
+support for it says nothing about the build host's, so the build breaks
+on any host with an older gcc.
+
+The modules are test-only artifacts: nothing links or installs them,
+and they are consumed solely by the tcl suite that `make test` drives
+from the build tree. Drop them from `all` (`test` keeps its own
+module_tests prerequisite) so no host compiler is involved in the
+cross build at all. This has to happen in the Makefile rather than by
+picking narrower goals in the caller, because `install: all` re-runs
+the phony module_tests target on its own.
+
+Upstream-Status: Inappropriate [oe-specific]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 5cb4f67..4fb643b 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -410,7 +410,7 @@ REDIS_CHECK_RDB_NAME=redis-check-rdb$(PROG_SUFFIX)
+ REDIS_CHECK_AOF_NAME=redis-check-aof$(PROG_SUFFIX)
+ ALL_SOURCES=$(sort $(patsubst %.o,%.c,$(REDIS_SERVER_OBJ) $(REDIS_VEC_SETS_OBJ) $(REDIS_CLI_OBJ) $(REDIS_BENCHMARK_OBJ)))
+
+-all: $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME) $(TLS_MODULE) module_tests
++all: $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME) $(TLS_MODULE)
+ 	@echo ""
+ 	@echo "Hint: It's a good idea to run 'make test' ;)"
+ 	@echo ""
diff --git a/meta-oe/recipes-extended/redis/redis_8.10.1.bb b/meta-oe/recipes-extended/redis/redis_8.10.1.bb
index d0220d228b..40e92dc318 100644
--- a/meta-oe/recipes-extended/redis/redis_8.10.1.bb
+++ b/meta-oe/recipes-extended/redis/redis_8.10.1.bb
@@ -15,6 +15,7 @@  SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
            file://0003-hack-to-force-use-of-libc-malloc.patch \
            file://0004-src-Do-not-reset-FINAL_LIBS.patch \
            file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \
+           file://0006-src-Makefile-do-not-build-the-test-modules-from-all.patch \
           "
 SRC_URI[sha256sum] = "60166c95ab7aedaa9dfe516de685be0a4dd87be95ded59ba429df14c13f1b663"