mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-slava86.git
synced 2025-02-24 07:52:54 +00:00
Removed duplicates in patches
This commit is contained in:
Mikhail Novosyolov
parent
b2ac276c30
commit
fd65f6ed77
4 changed files with 1 additions and 83 deletions
|
|
@ -1,40 +0,0 @@
|
|||
From 0ae8906d7a52a7ab305c236668555c37fbbc1e76 Mon Sep 17 00:00:00 2001
|
||||
From: Alexey Gladkov <legion@altlinux.org>
|
||||
Date: Fri, 30 Mar 2018 21:27:10 +0300
|
||||
Subject: [PATCH 19/24] ALT: allow _FORTIFY_SOURCE for clang
|
||||
|
||||
Signed-off-by: Alexey Gladkov <legion@altlinux.org>
|
||||
---
|
||||
build/config/compiler/BUILD.gn | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
||||
index 959a5923174..988708210b1 100644
|
||||
--- a/build/config/compiler/BUILD.gn
|
||||
+++ b/build/config/compiler/BUILD.gn
|
||||
@@ -1516,21 +1516,21 @@ config("chromium_code") {
|
||||
}
|
||||
|
||||
# In Chromium code, we define __STDC_foo_MACROS in order to get the
|
||||
# C99 macros on Mac and Linux.
|
||||
defines = [
|
||||
"__STDC_CONSTANT_MACROS",
|
||||
"__STDC_FORMAT_MACROS",
|
||||
]
|
||||
|
||||
if (!is_debug && !using_sanitizer &&
|
||||
- (!is_linux || !is_clang || is_official_build) &&
|
||||
+ (!is_linux || is_official_build) &&
|
||||
current_cpu != "s390x" && current_cpu != "s390" &&
|
||||
current_cpu != "ppc64" && current_cpu != "ppc64" &&
|
||||
current_cpu != "mips" && current_cpu != "mips64") {
|
||||
# _FORTIFY_SOURCE isn't really supported by Clang now, see
|
||||
# http://llvm.org/bugs/show_bug.cgi?id=16821.
|
||||
# It seems to work fine with Ubuntu 12 headers though, so use it in
|
||||
# official builds.
|
||||
#
|
||||
# Non-chromium code is not guaranteed to compile cleanly with
|
||||
# _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
@ -39,17 +39,6 @@ index 6e38ad782d38..87bbd423f67f 100644
|
|||
# Print absolute paths in diagnostics. There is no precedent for doing this
|
||||
# on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
|
||||
# Windows developers rely on it (crbug.com/636109) so only do this on Windows.
|
||||
@@ -1473,10 +1459,6 @@ config("default_warnings") {
|
||||
cflags += [
|
||||
# TODO(thakis): https://crbug.com/753973
|
||||
"-Wno-enum-compare-switch",
|
||||
-
|
||||
- # Ignore warnings about MSVC optimization pragmas.
|
||||
- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
|
||||
- "-Wno-ignored-pragma-optimize",
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -1518,22 +1500,6 @@ config("chromium_code") {
|
||||
"__STDC_FORMAT_MACROS",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
Author: Olivier Tilloy <olivier.tilloy@canonical.com>
|
||||
Description: revert of 074fa51f85b15ad2e2d6c804a03825d48dbeb063, which requires Clang r313108 (unreleased yet)
|
||||
|
||||
--- a/build/config/compiler/BUILD.gn
|
||||
+++ b/build/config/compiler/BUILD.gn
|
||||
@@ -488,18 +488,6 @@ config("compiler") {
|
||||
}
|
||||
}
|
||||
|
||||
- if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
|
||||
- target_os != "chromeos") {
|
||||
- cflags += [
|
||||
- # TODO(hans): Remove this once Clang generates better optimized debug info
|
||||
- # by default. https://crbug.com/765793
|
||||
- "-Xclang",
|
||||
- "-mllvm",
|
||||
- "-Xclang",
|
||||
- "-instcombine-lower-dbg-declare=0",
|
||||
- ]
|
||||
- }
|
||||
-
|
||||
# Print absolute paths in diagnostics. There is no precedent for doing this
|
||||
# on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
|
||||
# Windows developers rely on it (crbug.com/636109) so only do this on Windows.
|
||||
|
|
@ -95,7 +95,6 @@ Patch710: Debian-Fixes-gpu-timeout.patch
|
|||
Patch720: openSUSE-Compile-the-sandbox-with-fPIE-settings.patch
|
||||
# https://packages.altlinux.org/ru/Sisyphus/srpms/chromium/patches
|
||||
Patch730: ALT-allow-to-override-clang-through-env-variables.patch
|
||||
Patch731: ALT-allow-_FORTIFY_SOURCE-for-clang.patch
|
||||
Patch732: FEDORA-Fix-memcpy.patch
|
||||
Patch733: FEDORA-Fix-issue-where-timespec-is-not-defined-when-.patch
|
||||
Patch744: UBUNTU-define__libc_malloc.patch
|
||||
|
|
@ -106,7 +105,6 @@ Patch748: UBUNTU-enable-chromecast-by-default.patch
|
|||
Patch749: FEDORA-Fix-gcc-round.patch
|
||||
Patch750: UBUNTU-fix-extra-arflags.patch
|
||||
Patch751: UBUNTU-touch-v35.patch
|
||||
Patch752: UBUNTU-revert-Xclang-instcombine-lower-dbg-declare.patch
|
||||
# Patch753 does not work
|
||||
Patch753: ROSA-allow-Gold-on-Linux.patch
|
||||
Patch754: Gentoo-compiler-r4.patch
|
||||
|
|
@ -322,7 +320,6 @@ members of the Chromium and WebDriver teams.
|
|||
%patch710 -p1
|
||||
%patch720 -p1
|
||||
%patch730 -p1
|
||||
%patch731 -p1
|
||||
%patch732 -p1
|
||||
%patch733 -p1
|
||||
%patch744 -p1
|
||||
|
|
@ -333,12 +330,8 @@ members of the Chromium and WebDriver teams.
|
|||
%patch749 -p1
|
||||
%patch750 -p1
|
||||
%patch751 -p1
|
||||
%patch752 -p1
|
||||
#patch753 -p1
|
||||
# This patch (Gentoo-compiler-r4.patch) is partly applied by other patches.
|
||||
# This consctruction should apply the rest of the patch.
|
||||
# It's needed for lld linker on x86_64 to not fail.
|
||||
%patch754 -p1 || true
|
||||
%patch754 -p1
|
||||
|
||||
mkdir -p third_party/llvm-build/Release+Asserts/bin
|
||||
pushd third_party/llvm-build/Release+Asserts/bin
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue