summaryrefslogtreecommitdiff
path: root/dev-util/gn/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-04-12 03:41:30 +0100
commit623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree993eb27c93ec7a2d2d19550300d888fc1fed9e69 /dev-util/gn/files
parentceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'dev-util/gn/files')
-rw-r--r--dev-util/gn/files/gn-gen-r4.patch (renamed from dev-util/gn/files/gn-gen-r3.patch)24
1 files changed, 11 insertions, 13 deletions
diff --git a/dev-util/gn/files/gn-gen-r3.patch b/dev-util/gn/files/gn-gen-r4.patch
index 362a6854a264..717c908f29dd 100644
--- a/dev-util/gn/files/gn-gen-r3.patch
+++ b/dev-util/gn/files/gn-gen-r4.patch
@@ -1,6 +1,6 @@
-From bedf2161dea8cf4813fd14891feee2e8e8d5bf28 Mon Sep 17 00:00:00 2001
+From ad008cd029c995226fef36554e2e3cc657ef1380 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 14 Oct 2018 20:34:07 -0400
+Date: Sat, 14 Mar 2020 18:02:51 +0000
Subject: [PATCH] Remove unwanted cflags/ldflags parameters
---
@@ -8,10 +8,10 @@ Subject: [PATCH] Remove unwanted cflags/ldflags parameters
1 file changed, 9 deletions(-)
diff --git a/build/gen.py b/build/gen.py
-index a7142fab..06d5e2b3 100755
+index bcd9f15d..b48e844c 100755
--- a/build/gen.py
+++ b/build/gen.py
-@@ -278,11 +278,6 @@ def WriteGNNinja(path, platform, host, options):
+@@ -288,11 +288,6 @@ def WriteGNNinja(path, platform, host, options):
if options.debug:
cflags.extend(['-O0', '-g'])
else:
@@ -23,7 +23,7 @@ index a7142fab..06d5e2b3 100755
# Use -fdata-sections and -ffunction-sections to place each function
# or data item into its own section so --gc-sections can eliminate any
# unused functions and data items.
-@@ -311,7 +306,6 @@ def WriteGNNinja(path, platform, host, options):
+@@ -325,7 +320,6 @@ def WriteGNNinja(path, platform, host, options):
'-D_FILE_OFFSET_BITS=64',
'-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
'-pthread',
@@ -31,18 +31,16 @@ index a7142fab..06d5e2b3 100755
'-fno-exceptions',
'-fno-rtti',
'-fdiagnostics-color',
-@@ -320,11 +314,8 @@ def WriteGNNinja(path, platform, host, options):
+@@ -341,9 +335,6 @@ def WriteGNNinja(path, platform, host, options):
+ if not options.no_static_libstdcpp:
+ ldflags.append('-static-libstdc++')
- if platform.is_linux():
- ldflags.extend([
-- '-static-libstdc++',
- '-Wl,--as-needed',
- ])
- # This is needed by libc++.
-- libs.append('-ldl')
+- if not platform.is_mingw():
+- libs.append('-ldl')
elif platform.is_darwin():
min_mac_version_flag = '-mmacosx-version-min=10.9'
cflags.append(min_mac_version_flag)
--
-2.21.0
+2.24.1