diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /dev-util/ninja/files | |
parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'dev-util/ninja/files')
-rw-r--r-- | dev-util/ninja/files/ninja-1.10.0-readme.patch | 38 | ||||
-rw-r--r-- | dev-util/ninja/files/ninja-cflags.patch | 25 |
2 files changed, 63 insertions, 0 deletions
diff --git a/dev-util/ninja/files/ninja-1.10.0-readme.patch b/dev-util/ninja/files/ninja-1.10.0-readme.patch new file mode 100644 index 000000000000..1d84f123daf0 --- /dev/null +++ b/dev-util/ninja/files/ninja-1.10.0-readme.patch @@ -0,0 +1,38 @@ +From b748d085618bf5e802de6a13b07d632d20ab04bf Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Fri, 20 Mar 2020 19:36:01 -0400 +Subject: [PATCH] Replace references to README with README.md + +The README file was renamed to README.md in commit +a37da20ae74c81703b1c811182fc154d95ed46fe. +--- + configure.py | 2 +- + misc/packaging/ninja.spec | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.py b/configure.py +index 7d8ce9045..8eef7e6eb 100755 +--- a/configure.py ++++ b/configure.py +@@ -649,7 +649,7 @@ def has_re2c(): + command='$doxygen_mainpage_generator $in > $out', + description='DOXYGEN_MAINPAGE $out') + mainpage = n.build(built('doxygen_mainpage'), 'doxygen_mainpage', +- ['README', 'COPYING'], ++ ['README.md', 'COPYING'], + implicit=['$doxygen_mainpage_generator']) + n.build('doxygen', 'doxygen', doc('doxygen.config'), + implicit=mainpage) +diff --git a/misc/packaging/ninja.spec b/misc/packaging/ninja.spec +index 05f5a079a..36e518186 100644 +--- a/misc/packaging/ninja.spec ++++ b/misc/packaging/ninja.spec +@@ -32,7 +32,7 @@ cp -p ninja %{buildroot}%{_bindir}/ + + %files + %defattr(-, root, root) +-%doc COPYING README doc/manual.html ++%doc COPYING README.md doc/manual.html + %{_bindir}/* + + %clean diff --git a/dev-util/ninja/files/ninja-cflags.patch b/dev-util/ninja/files/ninja-cflags.patch new file mode 100644 index 000000000000..0c4ef2813bb7 --- /dev/null +++ b/dev-util/ninja/files/ninja-cflags.patch @@ -0,0 +1,25 @@ +From e4530769ef6a497f8f5f06159f6be049dc20e2ea Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Thu, 19 Mar 2020 11:21:29 -0400 +Subject: [PATCH] Avoid adding -O2 -DNDEBUG to cflags + +--- + configure.py | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/configure.py b/configure.py +index 7d8ce90..7566147 100755 +--- a/configure.py ++++ b/configure.py +@@ -344,8 +344,6 @@ else: + if options.debug: + cflags += ['-D_GLIBCXX_DEBUG', '-D_GLIBCXX_DEBUG_PEDANTIC'] + cflags.remove('-fno-rtti') # Needed for above pedanticness. +- else: +- cflags += ['-O2', '-DNDEBUG'] + try: + proc = subprocess.Popen( + [CXX, '-fdiagnostics-color', '-c', '-x', 'c++', '/dev/null', +-- +2.25.1 + |