* [gentoo-commits] repo/gentoo:master commit in: dev-util/ninja/, dev-util/ninja/files/
@ 2019-04-03 19:50 Mike Gilbert
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert @ 2019-04-03 19:50 UTC (permalink / raw
To: gentoo-commits
commit: b6ab66e96f36dd162edf26463d9fa93c2f3f131e
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 3 19:49:49 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Apr 3 19:49:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6ab66e9
dev-util/ninja: fix build on bsd/musl
Closes: https://bugs.gentoo.org/663216
Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-util/ninja/files/ninja-1.9.0-musl.patch | 39 +++++++++++++++++++++++++++++
dev-util/ninja/ninja-1.9.0.ebuild | 6 ++++-
dev-util/ninja/ninja-9999.ebuild | 2 +-
3 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/dev-util/ninja/files/ninja-1.9.0-musl.patch b/dev-util/ninja/files/ninja-1.9.0-musl.patch
new file mode 100644
index 00000000000..f6aeb428974
--- /dev/null
+++ b/dev-util/ninja/files/ninja-1.9.0-musl.patch
@@ -0,0 +1,39 @@
+From 567815df38a2ff54ad7478a90bd75c91e434236a Mon Sep 17 00:00:00 2001
+From: makepost <makepost@firemail.cc>
+Date: Mon, 24 Dec 2018 03:13:16 +0200
+Subject: [PATCH] Use st_mtim if st_mtime is macro, fix #1510
+
+In POSIX.1-2008, sys_stat has a st_mtim member and a st_mtime backward
+compatibility macro. Should help avoid hardcoding platform detection.
+---
+ src/disk_interface.cc | 14 ++++----------
+ 1 file changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/src/disk_interface.cc b/src/disk_interface.cc
+index d4c2fb087..dc297c449 100644
+--- a/src/disk_interface.cc
++++ b/src/disk_interface.cc
+@@ -202,19 +202,13 @@ TimeStamp RealDiskInterface::Stat(const string& path, string* err) const {
+ // that it doesn't exist.
+ if (st.st_mtime == 0)
+ return 1;
+-#if defined(__APPLE__) && !defined(_POSIX_C_SOURCE)
++#if defined(_AIX)
++ return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n;
++#elif defined(__APPLE__)
+ return ((int64_t)st.st_mtimespec.tv_sec * 1000000000LL +
+ st.st_mtimespec.tv_nsec);
+-#elif (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700 || defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || \
+- defined(__BIONIC__) || (defined (__SVR4) && defined (__sun)) || defined(__FreeBSD__))
+- // For glibc, see "Timestamp files" in the Notes of http://www.kernel.org/doc/man-pages/online/pages/man2/stat.2.html
+- // newlib, uClibc and musl follow the kernel (or Cygwin) headers and define the right macro values above.
+- // For bsd, see https://github.com/freebsd/freebsd/blob/master/sys/sys/stat.h and similar
+- // For bionic, C and POSIX API is always enabled.
+- // For solaris, see https://docs.oracle.com/cd/E88353_01/html/E37841/stat-2.html.
++#elif defined(st_mtime) // A macro, so we're likely on modern POSIX.
+ return (int64_t)st.st_mtim.tv_sec * 1000000000LL + st.st_mtim.tv_nsec;
+-#elif defined(_AIX)
+- return (int64_t)st.st_mtime * 1000000000LL + st.st_mtime_n;
+ #else
+ return (int64_t)st.st_mtime * 1000000000LL + st.st_mtimensec;
+ #endif
diff --git a/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild
index 8eb95d5047f..4bc01a90da3 100644
--- a/dev-util/ninja/ninja-1.9.0.ebuild
+++ b/dev-util/ninja/ninja-1.9.0.ebuild
@@ -44,7 +44,11 @@ RDEPEND="
app-editors/gvim
)
)
- !<net-irc/ninja-1.5.9_pre14-r1" #436804
+"
+
+PATCHES=(
+ "${FILESDIR}/ninja-1.9.0-musl.patch"
+)
run_for_build() {
if tc-is-cross-compiler; then
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index 8eb95d5047f..bd7bd0ad6ed 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
app-editors/gvim
)
)
- !<net-irc/ninja-1.5.9_pre14-r1" #436804
+"
run_for_build() {
if tc-is-cross-compiler; then
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ninja/, dev-util/ninja/files/
@ 2020-03-19 15:28 Mike Gilbert
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert @ 2020-03-19 15:28 UTC (permalink / raw
To: gentoo-commits
commit: add5f6d75a7b0c5d8aec6e44e48faef59f6d3c96
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 19 15:27:40 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Mar 19 15:27:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=add5f6d7
dev-util/ninja: fixup CFLAGS handling
Package-Manager: Portage-2.3.92_p3, Repoman-2.3.20_p118
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-util/ninja/files/ninja-cflags.patch | 25 +++++++++++++++++++++++++
dev-util/ninja/ninja-1.10.0.ebuild | 8 ++++++--
dev-util/ninja/ninja-1.9.0.ebuild | 8 ++++++--
dev-util/ninja/ninja-9999.ebuild | 8 ++++++--
4 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/dev-util/ninja/files/ninja-cflags.patch b/dev-util/ninja/files/ninja-cflags.patch
new file mode 100644
index 00000000000..0c4ef2813bb
--- /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
+
diff --git a/dev-util/ninja/ninja-1.10.0.ebuild b/dev-util/ninja/ninja-1.10.0.ebuild
index 5275d630026..5e63fdd14f4 100644
--- a/dev-util/ninja/ninja-1.10.0.ebuild
+++ b/dev-util/ninja/ninja-1.10.0.ebuild
@@ -44,6 +44,10 @@ RDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}"/ninja-cflags.patch
+)
+
run_for_build() {
if tc-is-cross-compiler; then
local -x AR=$(tc-getBUILD_AR)
@@ -59,8 +63,8 @@ run_for_build() {
src_compile() {
tc-export AR CXX
- # configure.py uses CFLAGS instead of CXXFLAGS
- export CFLAGS=${CXXFLAGS}
+ # configure.py appends CFLAGS to CXXFLAGS
+ unset CFLAGS
run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
diff --git a/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild
index 9bf6dd5f8f9..36783d7d7b6 100644
--- a/dev-util/ninja/ninja-1.9.0.ebuild
+++ b/dev-util/ninja/ninja-1.9.0.ebuild
@@ -51,6 +51,10 @@ PATCHES=(
"${FILESDIR}/ninja-1.9.0-musl.patch"
)
+PATCHES=(
+ "${FILESDIR}"/ninja-cflags.patch
+)
+
run_for_build() {
if tc-is-cross-compiler; then
local -x AR=$(tc-getBUILD_AR)
@@ -66,8 +70,8 @@ run_for_build() {
src_compile() {
tc-export AR CXX
- # configure.py uses CFLAGS instead of CXXFLAGS
- export CFLAGS=${CXXFLAGS}
+ # configure.py appends CFLAGS to CXXFLAGS
+ unset CFLAGS
run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index bf75daf0bbb..5d9e2fbb5af 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -44,6 +44,10 @@ RDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}"/ninja-cflags.patch
+)
+
run_for_build() {
if tc-is-cross-compiler; then
local -x AR=$(tc-getBUILD_AR)
@@ -59,8 +63,8 @@ run_for_build() {
src_compile() {
tc-export AR CXX
- # configure.py uses CFLAGS instead of CXXFLAGS
- export CFLAGS=${CXXFLAGS}
+ # configure.py appends CFLAGS to CXXFLAGS
+ unset CFLAGS
run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/ninja/, dev-util/ninja/files/
@ 2020-03-20 23:43 Mike Gilbert
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert @ 2020-03-20 23:43 UTC (permalink / raw
To: gentoo-commits
commit: 073803ef5f2f587ae607ba0d02d505c95b975059
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 20 23:43:11 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Mar 20 23:43:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=073803ef
dev-util/ninja: fix doxygen build
Closes: https://bugs.gentoo.org/713720
Package-Manager: Portage-2.3.92_p3, Repoman-2.3.20_p118
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-util/ninja/files/ninja-1.10.0-readme.patch | 38 ++++++++++++++++++++++++++
dev-util/ninja/ninja-1.10.0.ebuild | 1 +
2 files changed, 39 insertions(+)
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 00000000000..1d84f123daf
--- /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/ninja-1.10.0.ebuild b/dev-util/ninja/ninja-1.10.0.ebuild
index 5e63fdd14f4..1f57d9e412c 100644
--- a/dev-util/ninja/ninja-1.10.0.ebuild
+++ b/dev-util/ninja/ninja-1.10.0.ebuild
@@ -46,6 +46,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/ninja-cflags.patch
+ "${FILESDIR}"/ninja-1.10.0-readme.patch
)
run_for_build() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-03-20 23:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-19 15:28 [gentoo-commits] repo/gentoo:master commit in: dev-util/ninja/, dev-util/ninja/files/ Mike Gilbert
-- strict thread matches above, loose matches on Subject: below --
2020-03-20 23:43 Mike Gilbert
2019-04-03 19:50 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox