pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

lld: adjust patches



Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Wed Aug 3 13:58:11 2022 +0200
Changeset:	38c480fd2eb2c353d0d37f71fa83fd0a02537a53

Modified Files:
	lld/distinfo
	lld/patches/patch-CMakeLists.txt
	lld/patches/patch-ELF_Config.h
	lld/patches/patch-ELF_Options.td

Log Message:
lld: adjust patches

so they apply without offset lines.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=38c480fd2eb2c353d0d37f71fa83fd0a02537a53

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

diffstat:
 lld/distinfo                     | 6 +++---
 lld/patches/patch-CMakeLists.txt | 6 +++---
 lld/patches/patch-ELF_Config.h   | 6 +++---
 lld/patches/patch-ELF_Options.td | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diffs:
diff --git a/lld/distinfo b/lld/distinfo
index 70ca6fe080..66b95d888c 100644
--- a/lld/distinfo
+++ b/lld/distinfo
@@ -3,6 +3,6 @@ $NetBSD: distinfo,v 1.16 2022/02/03 20:38:40 adam Exp $
 BLAKE2s (lld-14.0.6.src.tar.xz) = 2fc265b616bbdbaeecc8385fda204dbc28b1d871d98f4b3b3cd5183c4d6eefc8
 SHA512 (lld-14.0.6.src.tar.xz) = fad97b441f9642b73edd240af2c026259de0951d5ace42779e9e0fcf5e417252a1d744e2fc51e754a45016621ba0c70088177f88695af1c6ce290dd26873b094
 Size (lld-14.0.6.src.tar.xz) = 1366180 bytes
-SHA1 (patch-CMakeLists.txt) = 32163a5bcd7d9456065e48ef6e6f0e2c3380a820
-SHA1 (patch-ELF_Config.h) = c449bf971088da671df5da507347fe8dc8c9da82
-SHA1 (patch-ELF_Options.td) = 22a1f293681b86a9aac87624efcfeeb20a4ba51c
+SHA1 (patch-CMakeLists.txt) = 082e24d9c155f69a8256fcde486c427a7354cb69
+SHA1 (patch-ELF_Config.h) = 50861ef74c2ff9a9091afcbc8d076e379d9531e5
+SHA1 (patch-ELF_Options.td) = c81907d6e5e099ed2c26de972c6744b7197de3d3
diff --git a/lld/patches/patch-CMakeLists.txt b/lld/patches/patch-CMakeLists.txt
index 476b6cd8c4..d0d937b804 100644
--- a/lld/patches/patch-CMakeLists.txt
+++ b/lld/patches/patch-CMakeLists.txt
@@ -1,12 +1,12 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2021/07/12 18:47:15 adam Exp $
+$NetBSD$
 
 LLD 7.0.1 is incompatible with gtest version in pkgsrc.  Remove
 the condition that prevents it from building its own copy when system
 version is installed.
 
---- CMakeLists.txt.orig	2021-04-06 16:38:18.000000000 +0000
+--- CMakeLists.txt.orig	2022-06-22 16:46:24.000000000 +0000
 +++ CMakeLists.txt
-@@ -76,7 +76,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRE
+@@ -115,7 +115,6 @@ if(LLD_BUILT_STANDALONE)
        endif()
        set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest)
        if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h
diff --git a/lld/patches/patch-ELF_Config.h b/lld/patches/patch-ELF_Config.h
index 75a291d934..acc2278020 100644
--- a/lld/patches/patch-ELF_Config.h
+++ b/lld/patches/patch-ELF_Config.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-ELF_Config.h,v 1.8 2021/07/12 18:47:15 adam Exp $
+$NetBSD$
 
 Add dummy option for an AArch64 erratum.
 
---- ELF/Config.h.orig	2020-10-07 10:10:48.000000000 +0000
+--- ELF/Config.h.orig	2022-06-22 16:46:24.000000000 +0000
 +++ ELF/Config.h
-@@ -156,6 +156,7 @@ struct Configuration {
+@@ -170,6 +170,7 @@ struct Configuration {
    bool enableNewDtags;
    bool executeOnly;
    bool exportDynamic;
diff --git a/lld/patches/patch-ELF_Options.td b/lld/patches/patch-ELF_Options.td
index 985bef8b76..8a219ef344 100644
--- a/lld/patches/patch-ELF_Options.td
+++ b/lld/patches/patch-ELF_Options.td
@@ -1,10 +1,10 @@
-$NetBSD: patch-ELF_Options.td,v 1.4 2019/11/03 12:10:29 kamil Exp $
+$NetBSD$
 
 Add dummy option for an AArch64 erratum.
 
---- ELF/Options.td.orig	2019-07-17 14:54:02.000000000 +0000
+--- ELF/Options.td.orig	2022-06-22 16:46:24.000000000 +0000
 +++ ELF/Options.td
-@@ -168,6 +168,9 @@ defm filter: Eq<"filter", "Set DT_FILTER
+@@ -217,6 +217,9 @@ defm filter: Eq<"filter", "Set DT_FILTER
  
  defm fini: Eq<"fini", "Specify a finalizer function">, MetaVarName<"<symbol>">;
  


Home | Main Index | Thread Index | Old Index