From 9a7575b2c6559e35538dfe5b18ae2adbb5c666be Mon Sep 17 00:00:00 2001
From: Alberto Sartori <alberto.sartori@huawei.com>
Date: Thu, 23 Feb 2023 11:35:40 +0100
Subject: add missing ldflags -pthread and use -pthread consistently

---
 etc/import.prebuilt/TARGETS.git2 | 2 +-
 etc/import/TARGETS.boringssl     | 2 +-
 etc/import/src/TARGETS.archive   | 2 +-
 etc/import/src/TARGETS.curl      | 2 +-
 etc/import/src/util/TARGETS.git2 | 2 +-
 etc/repos.json                   | 8 ++++----
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'etc')

diff --git a/etc/import.prebuilt/TARGETS.git2 b/etc/import.prebuilt/TARGETS.git2
index ceb3f09d..09d0ebba 100644
--- a/etc/import.prebuilt/TARGETS.git2
+++ b/etc/import.prebuilt/TARGETS.git2
@@ -7,7 +7,7 @@
     , "-lutil_hash_openssl"
     , "-lgit2_pcre"
     , "-lgit2_http_parser"
-    , "-lpthread"
+    , "-pthread"
     ]
   }
 }
diff --git a/etc/import/TARGETS.boringssl b/etc/import/TARGETS.boringssl
index ed63a8ae..5a853421 100644
--- a/etc/import/TARGETS.boringssl
+++ b/etc/import/TARGETS.boringssl
@@ -57,7 +57,7 @@
   , "private-hdrs": ["fips_fragments", "crypto_internal_headers"]
   , "srcs": ["crypto_sources", "crypto_sources_asm"]
   , "pure C": ["YES"]
-  , "private-ldflags": ["-lpthread"]
+  , "private-ldflags": ["-pthread"]
   }
 , "ssl-lib":
   { "type": ["@", "rules", "CC", "library"]
diff --git a/etc/import/src/TARGETS.archive b/etc/import/src/TARGETS.archive
index a9ee796d..ee3ff78b 100644
--- a/etc/import/src/TARGETS.archive
+++ b/etc/import/src/TARGETS.archive
@@ -6,7 +6,7 @@
     { "type": "if"
     , "cond":
       {"type": "==", "$1": {"type": "var", "name": "OS"}, "$2": "linux"}
-    , "then": ["-lpthread"]
+    , "then": ["-pthread"]
     }
   }
 , "archive_crypt":
diff --git a/etc/import/src/TARGETS.curl b/etc/import/src/TARGETS.curl
index d77766f1..1bfd750a 100644
--- a/etc/import/src/TARGETS.curl
+++ b/etc/import/src/TARGETS.curl
@@ -57,7 +57,7 @@
     , "then":
       { "type": "case*"
       , "expr": {"type": "var", "name": "OS"}
-      , "case": [["linux", ["-lpthread"]]]
+      , "case": [["linux", ["-pthread"]]]
       }
     }
   }
diff --git a/etc/import/src/util/TARGETS.git2 b/etc/import/src/util/TARGETS.git2
index 281d9c46..d3028a74 100644
--- a/etc/import/src/util/TARGETS.git2
+++ b/etc/import/src/util/TARGETS.git2
@@ -80,7 +80,7 @@
     , "$1":
       [ { "type": "if"
         , "cond": {"type": "var", "name": "THREADSAFE"}
-        , "then": ["-lpthread"]
+        , "then": ["-pthread"]
         }
       , { "type": "case"
         , "expr": {"type": "var", "name": "OS"}
diff --git a/etc/repos.json b/etc/repos.json
index 4774846e..a0256ddf 100644
--- a/etc/repos.json
+++ b/etc/repos.json
@@ -20,8 +20,8 @@
       , "bzip2": "bzip2"
       , "libarchive": "com_github_libarchive_libarchive"
       }
-    , "bootstrap": {"link": ["-lpthread"]}
-    , "bootstrap_local": {"link": ["-lpthread"]}
+    , "bootstrap": {"link": ["-pthread"]}
+    , "bootstrap_local": {"link": ["-pthread"]}
     }
   , "just-distfiles":
     { "repository":
@@ -218,13 +218,13 @@
     , "bindings": {"rules": "rules-boringssl"}
     , "bootstrap":
       { "build": "SYS=`uname -s | tr 'A-Z' 'a-z'` && ARCH=`uname -m` && {cc} {cflags} -I . -I src/include -c *.c src/crypto/*.c  src/crypto/*/*.c $SYS-$ARCH/crypto/fipsmodule/*.S && {ar} cqs libcrypto.a *.o"
-      , "link": ["-lcrypto", "-lpthread"]
+      , "link": ["-lcrypto", "-pthread"]
       , "include_dir": "src/include/openssl"
       , "include_name": "openssl"
       }
     , "local_bootstrap":
       { "local_path": "include/openssl"
-      , "link": ["-lcrypto", "-lpthread"]
+      , "link": ["-lcrypto", "-pthread"]
       , "link_dirs": ["lib"]
       }
     }
-- 
cgit v1.2.3