Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.34.1 prep #1539

Merged
merged 14 commits into from
Jan 10, 2025
+182 −117
Merged

1.34.1 prep #1539

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3f11669
Version bump
ac000 Dec 19, 2024
2dc9a4e
otel: fix segfaults when otel not configured
avahahn Jan 7, 2025
b5db001
otel: remove deadcode
avahahn Jan 7, 2025
8803a2b
auto/otel: Make use of nxt_feature_name
ac000 Dec 19, 2024
1175e40
auto/make: s/NXT_OTEL_LIB_LOC/NXT_OTEL_LIB_STATIC/
ac000 Jan 6, 2025
92c0d34
auto/make, otel: fix linking on macOS and Ubuntu
thresheek Dec 19, 2024
f1cf5fe
auto/make: Add missing NXT_OTEL_LIB_STATIC to some C tests
remicollet Dec 20, 2024
035b523
auto/otel: don't look for OpenSSL on Darwin
thresheek Dec 20, 2024
0b39cba
auto/make: Fix various issues with building OTEL
ac000 Jan 9, 2025
2356bd9
tools/unitctl: Update for version 1.34.1
ac000 Jan 10, 2025
83e1a94
docs/unit-openapi.yaml: Update version for 1.34.1
ac000 Jan 10, 2025
e7e3377
pkg/docker: Update dockerfiles for 1.34.1
ac000 Jan 10, 2025
87f7edc
docs/changes.xml: Add 1.34.1 changelog entries
ac000 Jan 10, 2025
ed6f67d
Add 1.34.1 CHANGES
ac000 Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
auto/make: Add missing NXT_OTEL_LIB_STATIC to some C tests 
Fixes: 9d3dcb8 ("otel: add build tooling to include otel code")
[ Commit subject, s/NXT_OTEL_LIB_LOC/NXT_OTEL_LIB_STATIC/ and placement
  of NXT_OTEL_LIB_STATIC tweaked as per @thresheek - Andrew ]
Signed-off-by: Andrew Clayton <[email protected]>
@remicollet @ac000
remicollet authored and ac000 committed Jan 10, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit f1cf5fe010012d0a173c95bc1ff0e622594c68d3
20 changes: 12 additions & 8 deletions auto/make
View file
Original file line number Diff line number Diff line change
@@ -265,36 +265,40 @@ tests: $NXT_BUILD_DIR/tests $NXT_BUILD_DIR/utf8_file_name_test \\
$NXT_BUILD_DIR/unit_websocket_echo

$NXT_BUILD_DIR/tests: \$(NXT_TEST_OBJS) \\
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
\$(NXT_OTEL_LIB_STATIC)
\$(PP_LD) \$@
\$(v)\$(NXT_EXEC_LINK) -o $NXT_BUILD_DIR/tests \\
\$(CFLAGS) \$(NXT_TEST_OBJS) \\
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \$(NXT_OTEL_LIB_STATIC) \\
$NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS

$NXT_BUILD_DIR/utf8_file_name_test: $NXT_LIB_UTF8_FILE_NAME_TEST_SRCS \\
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
\$(NXT_OTEL_LIB_STATIC)
\$(PP_LD) \$@
\$(v)\$(CC) \$(CFLAGS) \$(NXT_LIB_INCS) $NXT_LIB_AUX_CFLAGS \\
-o $NXT_BUILD_DIR/utf8_file_name_test \\
$NXT_LIB_UTF8_FILE_NAME_TEST_SRCS \\
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \$(NXT_OTEL_LIB_STATIC) \\
$NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS

$NXT_BUILD_DIR/ncq_test: $NXT_BUILD_DIR/src/test/nxt_ncq_test.o \\
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
\$(NXT_OTEL_LIB_STATIC)
\$(PP_LD) \$@
\$(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_BUILD_DIR/lib/$NXT_LIB_STATIC \$(NXT_OTEL_LIB_STATIC) \\
$NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS

$NXT_BUILD_DIR/vbcq_test: $NXT_BUILD_DIR/src/test/nxt_vbcq_test.o \\
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC
$NXT_BUILD_DIR/lib/$NXT_LIB_STATIC \\
\$(NXT_OTEL_LIB_STATIC)
\$(PP_LD) \$@
\$(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_BUILD_DIR/lib/$NXT_LIB_STATIC \$(NXT_OTEL_LIB_STATIC) \\
$NXT_LD_OPT $NXT_LIBM $NXT_LIBS $NXT_LIB_AUX_LIBS

$NXT_BUILD_DIR/unit_app_test: $NXT_BUILD_DIR/src/test/nxt_unit_app_test.o \\