CVS commit: pkgsrc/devel/tlsh

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Wed Dec 18 13:54:16 UTC 2024

Modified Files:
        pkgsrc/devel/tlsh: distinfo
        pkgsrc/devel/tlsh/patches: patch-CMakeLists.txt

Log Message:
devel/tlsh: Fix cannot find -lstdc++ on Linux


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/tlsh/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/tlsh/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/tlsh/distinfo
diff -u pkgsrc/devel/tlsh/distinfo:1.8 pkgsrc/devel/tlsh/distinfo:1.9
--- pkgsrc/devel/tlsh/distinfo:1.8      Sun Jan 14 20:07:45 2024
+++ pkgsrc/devel/tlsh/distinfo  Wed Dec 18 13:54:16 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2024/01/14 20:07:45 schmonz Exp $
+$NetBSD: distinfo,v 1.9 2024/12/18 13:54:16 nros Exp $
 
 BLAKE2s (tlsh-4.8.2.tar.gz) = 846377f453b4365ebcaabe09f22f5579087d50999e7edfc9dc8117277b7cb79e
 SHA512 (tlsh-4.8.2.tar.gz) = 5355c7734f5356a3a7a31ccc078254835871fc0369f1889a34131a0f810735201c68f674eb18e975b6a03a32e5c284899ca9ffdc1f583e42192188c172d2aad0
 Size (tlsh-4.8.2.tar.gz) = 3345458 bytes
-SHA1 (patch-CMakeLists.txt) = ce5dae73e7955cbf315fa97080390d6aba64f017
+SHA1 (patch-CMakeLists.txt) = d79845237b7ee3fe517ae1340c086ef7f18eecf8

Index: pkgsrc/devel/tlsh/patches/patch-CMakeLists.txt
diff -u pkgsrc/devel/tlsh/patches/patch-CMakeLists.txt:1.1 pkgsrc/devel/tlsh/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/devel/tlsh/patches/patch-CMakeLists.txt:1.1  Sun Jan 14 20:07:45 2024
+++ pkgsrc/devel/tlsh/patches/patch-CMakeLists.txt      Wed Dec 18 13:54:16 2024
@@ -1,6 +1,9 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2024/01/14 20:07:45 schmonz Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2024/12/18 13:54:16 nros Exp $
 
 Squelch configure warnings.
+Don't use static linking for libgcc and libstdc++,
+fixes "/bin/ld: cannot find -lstdc++" that occur on
+some systems.
 
 --- CMakeLists.txt.orig        2021-09-09 05:56:28.000000000 +0000
 +++ CMakeLists.txt
@@ -15,3 +18,12 @@ Squelch configure warnings.
  
  project(TLSH)
  
+@@ -139,7 +143,7 @@ if(MSVC)
+ endif()
+ 
+ # user can override CXX; make sure tests link and load properly regardless of LD_LIBRARY_PATH
+-if(CMAKE_COMPILER_IS_GNUCXX)
++if(FALSE)
+     set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc")
+     set(CMAKE_EXE_LINKER_FLAGS "-static-libstdc++")
+ endif()