From 06509a8ab079df9838adec9c6b2beb1ff5a9a202 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 15 Aug 2022 12:42:11 +0300
Subject: Switch to using -pthread instead of -D_REENTRANT/-lpthread in
 buildfiles and bump build2 version requirement to 0.15.0

---
 curl/curl/buildfile | 9 +--------
 curl/manifest       | 4 ++--
 2 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'curl')

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
-- 
cgit v1.1