diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2022-08-15 12:42:11 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2022-08-15 19:06:43 +0300 |
| commit | 06509a8ab079df9838adec9c6b2beb1ff5a9a202 (patch) | |
| tree | d6b76de44b4f037b33a45b125e035a357940f6d5 | |
| parent | d5b69bf18b20faf69f9de2b80a79c8b4f480269b (diff) | |
Switch to using -pthread instead of -D_REENTRANT/-lpthread in buildfiles and bump build2 version requirement to 0.15.0
| -rw-r--r-- | curl/curl/buildfile | 9 | ||||
| -rw-r--r-- | curl/manifest | 4 | ||||
| -rw-r--r-- | libcurl/libcurl/buildfile | 9 | ||||
| -rw-r--r-- | libcurl/manifest | 4 |
4 files changed, 6 insertions, 20 deletions
diff --git a/curl/curl/buildfile b/curl/curl/buildfile index f458c0e..9780540 100644 --- a/curl/curl/buildfile +++ b/curl/curl/buildfile @@ -13,15 +13,8 @@ tsys = $c.target.system # c.poptions += -DHAVE_CONFIG_H -# Note that the upstream package uses the -pthread compiler/linker option on -# Linux and FreeBSD. The option is unsupported by build2 so we pass -# -D_REENTRANT and -lpthread preprocessor/linker options instead. -# switch $tclass, $tsys { - case 'linux' | 'bsd' - c.poptions += -D_REENTRANT - case 'windows', 'win32-msvc' c.poptions += -DWIN32 } @@ -50,7 +43,7 @@ switch $c.class switch $tclass, $tsys { case 'linux' | 'bsd' - c.libs += -lpthread + c.libs += -pthread case 'windows', 'mingw32' c.libs+= -lws2_32 diff --git a/curl/manifest b/curl/manifest index 35bc4ca..b8d1311 100644 --- a/curl/manifest +++ b/curl/manifest @@ -15,7 +15,7 @@ package-email: packaging@build2.org ; Mailing list. build-warning-email: builds@build2.org builds: all builds: -wasm -depends: * build2 >= 0.13.0 -depends: * bpkg >= 0.13.0 +depends: * build2 >= 0.15.0 +depends: * bpkg >= 0.15.0 depends: libcurl == $ depends: libca-certificates-curl ^1.0.0 diff --git a/libcurl/libcurl/buildfile b/libcurl/libcurl/buildfile index 58f7bb2..a8411d0 100644 --- a/libcurl/libcurl/buildfile +++ b/libcurl/libcurl/buildfile @@ -71,15 +71,8 @@ c.poptions += -DBUILDING_LIBCURL -DHAVE_CONFIG_H \ if! $windows c.poptions += -DCURL_HIDDEN_SYMBOLS -# Note that the upstream package uses the -pthread compiler/linker option on -# Linux and FreeBSD. The option is unsupported by build2 so we pass -# -D_REENTRANT and -lpthread preprocessor/linker options instead. -# switch $tclass, $tsys { - case 'linux' | 'bsd' - c.poptions += -D_REENTRANT - case 'windows', 'win32-msvc' c.poptions += -DWIN32 } @@ -119,7 +112,7 @@ switch $tclass, $tsys c.loptions += -Wl,--no-undefined c.loptions += "-Wl,--version-script=$out_base/libcurl.vers" - c.libs += -lpthread + c.libs += -pthread } case 'macos' { diff --git a/libcurl/manifest b/libcurl/manifest index 2f18171..06a0c11 100644 --- a/libcurl/manifest +++ b/libcurl/manifest @@ -16,8 +16,8 @@ package-email: packaging@build2.org ; Mailing list. build-warning-email: builds@build2.org builds: all builds: -wasm -depends: * build2 >= 0.13.0 -depends: * bpkg >= 0.13.0 +depends: * build2 >= 0.15.0 +depends: * bpkg >= 0.15.0 depends: libz ^1.2.1100 depends: libcrypto ^1.1.1 depends: libssl ^1.1.1 |