Skip to content

Add windows static build support #164

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

Merged
brettmc merged 4 commits into from
Feb 10, 2025
Merged

Add windows static build support #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b66fe09
Add windows static build support
crazywhalecc Feb 6, 2025
cf6360c
Merge branch 'main' into patch-1
brettmc Feb 6, 2025
a75e612
Fix tsrmls cache init bug
crazywhalecc Feb 7, 2025
53b7ced
Add tsrm update in MINIT insteadof GINIT
crazywhalecc Feb 7, 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
2 changes: 1 addition & 1 deletion ext/config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ ARG_ENABLE('opentelemetry', 'opentelemetry support', 'no');
if (PHP_OPENTELEMETRY != 'no') {
AC_DEFINE('HAVE_OPENTELEMETRY', 1, 'opentelemetry support enabled');

EXTENSION('opentelemetry', 'opentelemetry.c otel_observer.c', '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
EXTENSION('opentelemetry', 'opentelemetry.c otel_observer.c', PHP_OPENTELEMETRY_SHARED, '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
}
4 changes: 4 additions & 0 deletions ext/opentelemetry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ PHP_RSHUTDOWN_FUNCTION(opentelemetry) {
}

PHP_MINIT_FUNCTION(opentelemetry) {
#if defined(ZTS) && defined(COMPILE_DL_OPENTELEMETRY)
ZEND_TSRMLS_CACHE_UPDATE();
#endif

REGISTER_INI_ENTRIES();

check_conflicts();
Expand Down