Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1642150728248770"
MIME-Version: 1.0
Date: Fri, 14 Jan 2022 08:58:48 +0000
From: "Thomas Merkel" <tm@netbsd.org>
Subject: CVS commit: pkgsrc/lang/clang
To: pkgsrc-changes@NetBSD.org
Reply-To: tm@netbsd.org
Message-Id: <20220114085848.D3A57FB24@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1642150728248770
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	tm
Date:		Fri Jan 14 08:58:48 UTC 2022

Modified Files:
	pkgsrc/lang/clang: distinfo
	pkgsrc/lang/clang/patches: patch-tools_clang-shlib_CMakeLists.txt
	    patch-tools_libclang_CMakeLists.txt

Log Message:
clang: fix patch files for solaris by providing a missing newline

Move file content to correct patch files based on the patch name.
Add missing newline to the end of one patch file.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 pkgsrc/lang/clang/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/clang/patches/patch-tools_clang-shlib_CMakeLists.txt \
    pkgsrc/lang/clang/patches/patch-tools_libclang_CMakeLists.txt

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


--_----------=_1642150728248770
Content-Disposition: inline
Content-Length: 7272
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/clang/distinfo
diff -u pkgsrc/lang/clang/distinfo:1.71 pkgsrc/lang/clang/distinfo:1.72
--- pkgsrc/lang/clang/distinfo:1.71	Tue Jan 11 17:27:39 2022
+++ pkgsrc/lang/clang/distinfo	Fri Jan 14 08:58:48 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.71 2022/01/11 17:27:39 tm Exp $
+$NetBSD: distinfo,v 1.72 2022/01/14 08:58:48 tm Exp $
 
 BLAKE2s (clang-13.0.0.src.tar.xz) = 3a07b8456c7bb3e6a5446d01dbe7606cd0caeacc38606dd59632d14f89480850
 SHA512 (clang-13.0.0.src.tar.xz) = b9ae85a7f0a66ae42a6d76a4e1ea0940bf622f7fbd21d078c9fef146087c70abb0a597a1cfda4e8706b1fbc74d170986451f5f2d642f685a5c355da8a572fb26
@@ -8,5 +8,5 @@ SHA1 (patch-lib_Driver_ToolChain.cpp) = 
 SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = 1a139612ce181dfce1ea3a627dcd76bc81f05455
 SHA1 (patch-lib_Driver_ToolChains_Solaris.h) = 22d1ddef34b8df3cc29c4632108d45904797aff3
 SHA1 (patch-lib_Frontend_InitHeaderSearch.cpp) = 497ddbe1eac8726d736bed58557a795dce207d1a
-SHA1 (patch-tools_clang-shlib_CMakeLists.txt) = 13a34679d741217975333fd4ae313c3938e6f0fd
-SHA1 (patch-tools_libclang_CMakeLists.txt) = 2dce9cfc1e114a79fab457211eea1ee93c2198f4
+SHA1 (patch-tools_clang-shlib_CMakeLists.txt) = 2dce9cfc1e114a79fab457211eea1ee93c2198f4
+SHA1 (patch-tools_libclang_CMakeLists.txt) = 7e5655fc753ef20c8b08d1de438b26dcd3434525

Index: pkgsrc/lang/clang/patches/patch-tools_clang-shlib_CMakeLists.txt
diff -u pkgsrc/lang/clang/patches/patch-tools_clang-shlib_CMakeLists.txt:1.1 pkgsrc/lang/clang/patches/patch-tools_clang-shlib_CMakeLists.txt:1.2
--- pkgsrc/lang/clang/patches/patch-tools_clang-shlib_CMakeLists.txt:1.1	Tue Jan 11 17:27:39 2022
+++ pkgsrc/lang/clang/patches/patch-tools_clang-shlib_CMakeLists.txt	Fri Jan 14 08:58:48 2022
@@ -1,34 +1,14 @@
-$NetBSD: patch-tools_clang-shlib_CMakeLists.txt,v 1.1 2022/01/11 17:27:39 tm Exp $
+$NetBSD: patch-tools_clang-shlib_CMakeLists.txt,v 1.2 2022/01/14 08:58:48 tm Exp $
 
-Only the linker on Solaris 11.4 supports GNU ld version script and only if
-the special option gnu-version-script-compat is used. Older Solaris linker
-doesn't support version script.
+-B flag symbolic-functions is not supported on Solaris before 11.4
 
---- tools/libclang/CMakeLists.txt.orig	2021-09-24 16:18:10.000000000 +0000
-+++ tools/libclang/CMakeLists.txt
-@@ -167,11 +167,21 @@ if(ENABLE_SHARED)
-     endif()
-   endif()
-   if (USE_VERSION_SCRIPT)
--    target_link_options(libclang PRIVATE "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libclang.map")
--    # The Solaris 11.4 linker supports a subset of GNU ld version scripts,
--    # but requires a special option to enable it.
-     if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
--      target_link_options(libclang PRIVATE "-Wl,-z,gnu-version-script-compat")
-+      include(CheckLinkerFlag)
-+      # The Solaris 11.4 linker supports a subset of GNU ld version scripts,
-+      # but requires a special option to enable it.
-+      llvm_check_linker_flag(CXX "-Wl,-z,gnu-version-script-compat" LINKER_SUPPORTS_Z_GNU_VERSION_SCRIPT_COMPAT)
-+      # Older Solaris (and illumos) linker doesn't support GNU ld version 
-+      # and doesn't support GNU version script compat.
-+      if (LINKER_SUPPORTS_Z_GNU_VERSION_SCRIPT_COMPAT)
-+	target_link_options(libclang PRIVATE "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libclang.map")
-+	target_link_options(libclang PRIVATE "-Wl,-z,gnu-version-script-compat")
-+      else()
-+        target_link_options(libclang PRIVATE "-Wl,-M,${CMAKE_CURRENT_SOURCE_DIR}/libclang.map")
-+      endif()
-+    else() 
-+      target_link_options(libclang PRIVATE "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libclang.map")
-     endif()
-     # Ensure that libclang.so gets rebuilt when the linker script changes.
-     set_property(SOURCE ARCMigrate.cpp APPEND PROPERTY
\ No newline at end of file
+--- tools/clang-shlib/CMakeLists.txt.orig	2021-09-24 16:18:10.000000000 +0000
++++ tools/clang-shlib/CMakeLists.txt
+@@ -50,6 +50,6 @@ add_clang_library(clang-cpp
+                   ${_DEPS})
+ # Optimize function calls for default visibility definitions to avoid PLT and
+ # reduce dynamic relocations.
+-if (NOT APPLE AND NOT MINGW)
++if (NOT APPLE AND NOT MINGW AND NOT "SunOS" MATCHES ${CMAKE_SYSTEM_NAME})
+   target_link_options(clang-cpp PRIVATE LINKER:-Bsymbolic-functions)
+ endif()
Index: pkgsrc/lang/clang/patches/patch-tools_libclang_CMakeLists.txt
diff -u pkgsrc/lang/clang/patches/patch-tools_libclang_CMakeLists.txt:1.1 pkgsrc/lang/clang/patches/patch-tools_libclang_CMakeLists.txt:1.2
--- pkgsrc/lang/clang/patches/patch-tools_libclang_CMakeLists.txt:1.1	Tue Jan 11 17:27:39 2022
+++ pkgsrc/lang/clang/patches/patch-tools_libclang_CMakeLists.txt	Fri Jan 14 08:58:48 2022
@@ -1,14 +1,34 @@
-$NetBSD: patch-tools_libclang_CMakeLists.txt,v 1.1 2022/01/11 17:27:39 tm Exp $
+$NetBSD: patch-tools_libclang_CMakeLists.txt,v 1.2 2022/01/14 08:58:48 tm Exp $
 
--B flag symbolic-functions is not supported on Solaris before 11.4
+Only the linker on Solaris 11.4 supports GNU ld version script and only if
+the special option gnu-version-script-compat is used. Older Solaris linker
+doesn't support version script.
 
---- tools/clang-shlib/CMakeLists.txt.orig	2021-09-24 16:18:10.000000000 +0000
-+++ tools/clang-shlib/CMakeLists.txt
-@@ -50,6 +50,6 @@ add_clang_library(clang-cpp
-                   ${_DEPS})
- # Optimize function calls for default visibility definitions to avoid PLT and
- # reduce dynamic relocations.
--if (NOT APPLE AND NOT MINGW)
-+if (NOT APPLE AND NOT MINGW AND NOT "SunOS" MATCHES ${CMAKE_SYSTEM_NAME})
-   target_link_options(clang-cpp PRIVATE LINKER:-Bsymbolic-functions)
- endif()
+--- tools/libclang/CMakeLists.txt.orig	2021-09-24 16:18:10.000000000 +0000
++++ tools/libclang/CMakeLists.txt
+@@ -167,11 +167,21 @@ if(ENABLE_SHARED)
+     endif()
+   endif()
+   if (USE_VERSION_SCRIPT)
+-    target_link_options(libclang PRIVATE "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libclang.map")
+-    # The Solaris 11.4 linker supports a subset of GNU ld version scripts,
+-    # but requires a special option to enable it.
+     if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+-      target_link_options(libclang PRIVATE "-Wl,-z,gnu-version-script-compat")
++      include(CheckLinkerFlag)
++      # The Solaris 11.4 linker supports a subset of GNU ld version scripts,
++      # but requires a special option to enable it.
++      llvm_check_linker_flag(CXX "-Wl,-z,gnu-version-script-compat" LINKER_SUPPORTS_Z_GNU_VERSION_SCRIPT_COMPAT)
++      # Older Solaris (and illumos) linker doesn't support GNU ld version 
++      # and doesn't support GNU version script compat.
++      if (LINKER_SUPPORTS_Z_GNU_VERSION_SCRIPT_COMPAT)
++	target_link_options(libclang PRIVATE "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libclang.map")
++	target_link_options(libclang PRIVATE "-Wl,-z,gnu-version-script-compat")
++      else()
++        target_link_options(libclang PRIVATE "-Wl,-M,${CMAKE_CURRENT_SOURCE_DIR}/libclang.map")
++      endif()
++    else() 
++      target_link_options(libclang PRIVATE "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libclang.map")
+     endif()
+     # Ensure that libclang.so gets rebuilt when the linker script changes.
+     set_property(SOURCE ARCMigrate.cpp APPEND PROPERTY


--_----------=_1642150728248770--