diff options
| author | s-ol <s+removethis@s-ol.nu> | 2026-04-20 17:18:32 +0000 |
|---|---|---|
| committer | s-ol <s+removethis@s-ol.nu> | 2026-04-20 17:18:32 +0000 |
| commit | 235147b648657e646c79c182d52186f772294e78 (patch) | |
| tree | 9bd66b3f936efc32dc9947d0164ace54b49ba820 | |
| parent | Merge commit 'refs/pullreqs/253' (diff) | |
| download | folk-s-ol/workaround.tar.gz folk-s-ol/workaround.zip | |
workaround wslays-ol/workaround
| -rw-r--r-- | builtin-programs/web/web.folk | 26 | ||||
| -rw-r--r-- | lib/ws.tcl | 6 |
2 files changed, 16 insertions, 16 deletions
diff --git a/builtin-programs/web/web.folk b/builtin-programs/web/web.folk index 56f74e8a..966e004f 100644 --- a/builtin-programs/web/web.folk +++ b/builtin-programs/web/web.folk @@ -8,19 +8,19 @@ puts "web: [__threadId] (PID [pid])" signal handle SIGPIPE # To force a rebuild: rm vendor/wslay/Makefile -set wslayFresh [expr {![file exists vendor/wslay/lib/.libs/libwslay.a]}] -if {![file exists vendor/wslay/Makefile]} { - puts "web: Configuring libwslay..." - exec sh -c {cd vendor/wslay && autoreconf -i && automake && autoconf && ./configure} \ - >@stdout 2>@stderr -} -puts "web: Building libwslay..." -exec make -C vendor/wslay >@stdout 2>@stderr -if {$wslayFresh && $::tcl_platform(os) eq "linux"} { - exec patchelf --set-soname "[pwd]/vendor/wslay/lib/.libs/libwslay.so.0" \ - vendor/wslay/lib/.libs/libwslay.so.0 -} -puts "web: libwslay built." +# set wslayFresh [expr {![file exists vendor/wslay/lib/.libs/libwslay.a]}] +# if {![file exists vendor/wslay/Makefile]} { +# puts "web: Configuring libwslay..." +# exec sh -c {cd vendor/wslay && autoreconf -i && automake && autoconf && ./configure} \ +# >@stdout 2>@stderr +# } +# puts "web: Building libwslay..." +# exec make -C vendor/wslay >@stdout 2>@stderr +# if {$wslayFresh && $::tcl_platform(os) eq "linux"} { +# exec patchelf --set-soname "[pwd]/vendor/wslay/lib/.libs/libwslay.so.0" \ +# vendor/wslay/lib/.libs/libwslay.so.0 +# } +# puts "web: libwslay built." source "lib/ws.tcl" # We export wsLib so that other threads can emit messages onto @@ -1,5 +1,5 @@ set cc [C] -$cc cflags -I./vendor/wslay/lib/includes +# $cc cflags -I./vendor/wslay/lib/includes $cc include <errno.h> $cc include <sys/socket.h> @@ -171,8 +171,8 @@ $cc proc wsDestroy {wslay_event_context_ptr ctx} void { // FIXME: free the WsSession wslay_event_context_free(ctx); } -$cc endcflags ./vendor/wslay/lib/.libs/libwslay.a - +# $cc endcflags ./vendor/wslay/lib/.libs/libwslay.a +$cc endcflags /usr/lib/libwslay.so set wsLib [$cc compile] # This pipe is used so that other threads can queue up messages to # send out through WebSockets. |