Skip to contentSkip to conversation

Makefile: Fix CUNIT_INSTALLED test to work with make 4.3 and dash

PATCH In review Vitaly Chikunov 2 participants 3 messages Jul 20, 2020 – Jul 22, 2020 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Makefile: Fix CUNIT_INSTALLED test to work with make 4.3 and dash

In GNU Make 4.3 there is backward incompatible change that there is no need to quote '#' in shell invocations anymore. If quoted, backslash character is passed into gcc making cunit (and vsock) tests fail to compile.

Also, echo -e' is replaced with printf' to interpret '\n', because, on Debian dash's echo' does not support -e', thus having `-e' passed into test source making gcc fail to compile the test.

make test error message:

Makefile:342: *** CUnit framework not installed, cannot build unit tests. Stop.

---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Makefile +4 -2
index 4b72a04..6b606da 100644
@@ -86,6 +86,8 @@ plugin_traceevent_dir_SQ = $(subst ','\'',$(plugin_traceevent_dir))
 plugin_tracecmd_dir_SQ = $(subst ','\'',$(plugin_tracecmd_dir))
 python_dir_SQ = $(subst ','\'',$(python_dir))
 
+pound := \#
+
 VAR_DIR = -DVAR_DIR="$(var_dir)"
 VAR_DIR_SQ = '$(subst ','\'',$(VAR_DIR))'
 var_dir_SQ = '$(subst ','\'',$(var_dir))'
@@ -233,14 +235,14 @@ CFLAGS ?= -g -Wall
 CPPFLAGS ?=
 LDFLAGS ?=
 
-VSOCK_DEFINED := $(shell if (echo "\#include <linux/vm_sockets.h>" | $(CC) -E - >/dev/null 2>&1) ; then echo 1; else echo 0 ; fi)
+VSOCK_DEFINED := $(shell if (echo "$(pound)include <linux/vm_sockets.h>" | $(CC) -E - >/dev/null 2>&1) ; then echo 1; else echo 0 ; fi)
 
 export VSOCK_DEFINED
 ifeq ($(VSOCK_DEFINED), 1)
 CFLAGS += -DVSOCK
 endif
 
-CUNIT_INSTALLED := $(shell if (echo -e "\#include <CUnit/Basic.h>\n void main(){CU_initialize_registry();}" | $(CC) -x c -lcunit - >/dev/null 2>&1) ; then echo 1; else echo 0 ; fi)
+CUNIT_INSTALLED := $(shell if (printf "$(pound)include <CUnit/Basic.h>\n void main(){CU_initialize_registry();}" | $(CC) -x c -lcunit - >/dev/null 2>&1) ; then echo 1; else echo 0 ; fi)
 export CUNIT_INSTALLED
 
 export CFLAGS
Signature · 1 line
2.11.0
#1 lore raw

PATCH 2/2 Makefile: Fix build of utest on systems with --as-needed enabled

On systems (such as ALT Linux) where --as-needed' is passed to ld by default, building tests fail due to CUNIT_INSTALLED test failure to link with libcunit, becasue -lcunit' is passed before input file (which is -'). Move -lcunit' after '-' to link it properly.

To reproduce make CC='gcc -Wl,--as-needed' test. Error message:

Makefile:344: *** CUnit framework not installed, cannot build unit tests. Stop.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
index 6b606da..83e5646 100644
@@ -242,7 +242,7 @@ ifeq ($(VSOCK_DEFINED), 1)
 CFLAGS += -DVSOCK
 endif
 
-CUNIT_INSTALLED := $(shell if (printf "$(pound)include <CUnit/Basic.h>\n void main(){CU_initialize_registry();}" | $(CC) -x c -lcunit - >/dev/null 2>&1) ; then echo 1; else echo 0 ; fi)
+CUNIT_INSTALLED := $(shell if (printf "$(pound)include <CUnit/Basic.h>\n void main(){CU_initialize_registry();}" | $(CC) -x c - -lcunit >/dev/null 2>&1) ; then echo 1; else echo 0 ; fi)
 export CUNIT_INSTALLED
 
 export CFLAGS
Signature · 1 line
2.11.0
#2 lore raw

Re: [PATCH 2/2] Makefile: Fix build of utest on systems with --as-needed enabled

Quoted 11 lines · On Mon, 20 Jul 2020 19:44:53 +0300 Vitaly Chikunov <[email protected]> wrote:

On systems (such as ALT Linux) where --as-needed' is passed to ld by default, building tests fail due to CUNIT_INSTALLED test failure to link with libcunit, becasue -lcunit' is passed before input file (which is -'). Move -lcunit' after '-' to link it properly.

To reproduce make CC='gcc -Wl,--as-needed' test. Error message:

Makefile:344: *** CUnit framework not installed, cannot build unit tests. Stop.

I applied both these patches and released 2.9.1.

Thanks Vitaly!

-- Steve

Quoted 17 lines
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
index 6b606da..83e5646 100644
@@ -242,7 +242,7 @@ ifeq ($(VSOCK_DEFINED), 1)
 CFLAGS += -DVSOCK
 endif
 
-CUNIT_INSTALLED := $(shell if (printf "$(pound)include <CUnit/Basic.h>\n void main(){CU_initialize_registry();}" | $(CC) -x c -lcunit - >/dev/null 2>&1) ; then echo 1; else echo 0 ; fi)
+CUNIT_INSTALLED := $(shell if (printf "$(pound)include <CUnit/Basic.h>\n void main(){CU_initialize_registry();}" | $(CC) -x c - -lcunit >/dev/null 2>&1) ; then echo 1; else echo 0 ; fi)
 export CUNIT_INSTALLED
 
 export CFLAGS