diff options
| author | Remi Collet <remi@remirepo.net> | 2024-12-20 09:52:24 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-12-20 09:52:24 +0100 |
| commit | 06a269da8ec013fb0b7259d35ae34a5f1c18b314 (patch) | |
| tree | 998142de2331ad02b01d50534be92a6679bbea4f /unit-tests.patch | |
| parent | 0eefe9825d5f97e63de2877236934ba5ce5aa61d (diff) | |
re-license spec file to CECILL-2.1
enable otel support
fix build of tests with otel using patch from
https://github.com/nginx/unit/pull/1521
re-license spec file to CECILL-2.1
enable otel support
fix build of tests with otel using patch from
https://github.com/nginx/unit/pull/1521
Diffstat (limited to 'unit-tests.patch')
| -rw-r--r-- | unit-tests.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/unit-tests.patch b/unit-tests.patch new file mode 100644 index 0000000..5c73995 --- /dev/null +++ b/unit-tests.patch @@ -0,0 +1,49 @@ +From c91f99facf5069359bb981ffa8daa7a0c72bc17c Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 20 Dec 2024 09:16:03 +0100 +Subject: [PATCH] add libotel for tests + +--- + auto/make | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/auto/make b/auto/make +index 183e95c75..e5e41a69c 100644 +--- a/auto/make ++++ b/auto/make +@@ -269,7 +269,7 @@ $NXT_BUILD_DIR/tests: \$(NXT_TEST_OBJS) \\ + \$(v)\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/tests \\ + \$(CFLAGS) \$(NXT_TEST_OBJS) \\ + $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\ +- $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS ++ $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS \$(NXT_OTEL_LIB_LOC) + + $NXT_BUILD_DIR/utf8_file_name_test: $NXT_LIB_UTF8_FILE_NAME_TEST_SRCS \\ + $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC +@@ -278,7 +278,7 @@ $NXT_BUILD_DIR/utf8_file_name_test: $NXT_LIB_UTF8_FILE_NAME_TEST_SRCS \\ + -o $NXT_BUILD_DIR/utf8_file_name_test \\ + $NXT_LIB_UTF8_FILE_NAME_TEST_SRCS \\ + $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\ +- $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS ++ $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS \$(NXT_OTEL_LIB_LOC) + + $NXT_BUILD_DIR/ncq_test: $NXT_BUILD_DIR/src/test/nxt_ncq_test.o \\ + $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC +@@ -286,7 +286,7 @@ $NXT_BUILD_DIR/ncq_test: $NXT_BUILD_DIR/src/test/nxt_ncq_test.o \\ + \$(v)\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/ncq_test \\ + \$(CFLAGS) $NXT_BUILD_DIR/src/test/nxt_ncq_test.o \\ + $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\ +- $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS ++ $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS \$(NXT_OTEL_LIB_LOC) + + $NXT_BUILD_DIR/vbcq_test: $NXT_BUILD_DIR/src/test/nxt_vbcq_test.o \\ + $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC +@@ -294,7 +294,7 @@ $NXT_BUILD_DIR/vbcq_test: $NXT_BUILD_DIR/src/test/nxt_vbcq_test.o \\ + \$(v)\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/vbcq_test \\ + \$(CFLAGS) $NXT_BUILD_DIR/src/test/nxt_vbcq_test.o \\ + $NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\ +- $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS ++ $NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS \$(NXT_OTEL_LIB_LOC) + + $NXT_BUILD_DIR/unit_app_test: $NXT_BUILD_DIR/src/test/nxt_unit_app_test.o \\ + $NXT_BUILD_DIR/lib/$NXT_LIB_UNIT_STATIC |