diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2025-05-29 19:26:19 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2025-05-29 19:26:19 +0000 |
| commit | 2d9a66e088a728e5320e076f6ebe2712c6bde06c (patch) | |
| tree | 6a61eda21ae00841d2438d2c21831ac928b7943f | |
| parent | bae6509ce0e32a1aee77ac585ff9e7c39cdd12c2 (diff) | |
| download | s6-portable-utils-2d9a66e088a728e5320e076f6ebe2712c6bde06c.tar.gz | |
Correctly use pthread_lib sysdep
| -rwxr-xr-x | configure | 8 | ||||
| -rwxr-xr-x | tools/configure.template | 8 |
2 files changed, 12 insertions, 4 deletions
@@ -391,8 +391,10 @@ echo " ... *.$shlibext" if $allpic ; then tryflag CPPFLAGS_AUTO -fPIC fi -spawn_lib=$(cat $sysdeps/spawn.lib) + +pthread_lib=$(cat $sysdeps/pthread.lib) socket_lib=$(cat $sysdeps/socket.lib) +spawn_lib=$(cat $sysdeps/spawn.lib) sysclock_lib=$(cat $sysdeps/sysclock.lib) timer_lib=$(cat $sysdeps/timer.lib) util_lib=$(cat $sysdeps/util.lib) @@ -461,8 +463,10 @@ home := $home exthome := $exthome extra_includedirs :=$depincpath extra_libdirs :=$deplibpath -SPAWN_LIB := ${spawn_lib} + +PTHREAD_LIB := ${pthread_lib} SOCKET_LIB := ${socket_lib} +SPAWN_LIB := ${spawn_lib} SYSCLOCK_LIB := ${sysclock_lib} TIMER_LIB := ${timer_lib} UTIL_LIB := ${util_lib} diff --git a/tools/configure.template b/tools/configure.template index db8f59a..ac8ac86 100755 --- a/tools/configure.template +++ b/tools/configure.template @@ -389,8 +389,10 @@ echo " ... *.$shlibext" if $allpic ; then tryflag CPPFLAGS_AUTO -fPIC fi -spawn_lib=$(cat $sysdeps/spawn.lib) + +pthread_lib=$(cat $sysdeps/pthread.lib) socket_lib=$(cat $sysdeps/socket.lib) +spawn_lib=$(cat $sysdeps/spawn.lib) sysclock_lib=$(cat $sysdeps/sysclock.lib) timer_lib=$(cat $sysdeps/timer.lib) util_lib=$(cat $sysdeps/util.lib) @@ -459,8 +461,10 @@ home := $home exthome := $exthome extra_includedirs :=$depincpath extra_libdirs :=$deplibpath -SPAWN_LIB := ${spawn_lib} + +PTHREAD_LIB := ${pthread_lib} SOCKET_LIB := ${socket_lib} +SPAWN_LIB := ${spawn_lib} SYSCLOCK_LIB := ${sysclock_lib} TIMER_LIB := ${timer_lib} UTIL_LIB := ${util_lib} |