[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    Re: [OE-core] [PATCH v2] ninja: upate to 1.9.0
From:       Oleksandr Kravchuk <open.source () oleksandr-kravchuk ! com>
Date:       2019-03-30 19:11:07
Message-ID: ca17a559-20c5-424c-a677-c37151467f5d () oleksandr-kravchuk ! com
[Download RAW message or body]

Khem -

Unfortunately, I could not find a solution of the doxygen build issue.

I have failed bug on doxygen and hope the community will assist:
https://github.com/doxygen/doxygen/issues/6906

On 28/03/2019 17:45, Khem Raj wrote:
> doxygen still fails
> 
> https://errors.yoctoproject.org/Errors/Details/234762/
> 
> On Sat, Mar 23, 2019 at 9:39 AM Oleksandr Kravchuk
> <open.source@oleksandr-kravchuk.com> wrote:
> > Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
> > ---
> > .../ninja/ninja/fix-musl.patch                | 39 +++++++++++++++++++
> > .../ninja/{ninja_1.8.2.bb => ninja_1.9.0.bb}  |  6 ++-
> > 2 files changed, 43 insertions(+), 2 deletions(-)
> > create mode 100644 meta/recipes-devtools/ninja/ninja/fix-musl.patch
> > rename meta/recipes-devtools/ninja/{ninja_1.8.2.bb => ninja_1.9.0.bb} (87%)
> > 
> > diff --git a/meta/recipes-devtools/ninja/ninja/fix-musl.patch \
> > b/meta/recipes-devtools/ninja/ninja/fix-musl.patch new file mode 100644
> > index 0000000000..543d4f1c48
> > --- /dev/null
> > +++ b/meta/recipes-devtools/ninja/ninja/fix-musl.patch
> > @@ -0,0 +1,39 @@
> > +2ff54ad7478a90bd75c91e434236a 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
> > +--- src/disk_interface.cc
> > ++++ /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/meta/recipes-devtools/ninja/ninja_1.8.2.bb \
> > b/meta/recipes-devtools/ninja/ninja_1.9.0.bb similarity index 87%
> > rename from meta/recipes-devtools/ninja/ninja_1.8.2.bb
> > rename to meta/recipes-devtools/ninja/ninja_1.9.0.bb
> > index c6fcfef3dd..1b06328961 100644
> > --- a/meta/recipes-devtools/ninja/ninja_1.8.2.bb
> > +++ b/meta/recipes-devtools/ninja/ninja_1.9.0.bb
> > @@ -5,9 +5,11 @@ LIC_FILES_CHKSUM = \
> > "file://COPYING;md5=a81586a64ad4e476c791cda7e2f2c52e" 
> > DEPENDS = "re2c-native ninja-native"
> > 
> > -SRCREV = "253e94c1fa511704baeb61cf69995bbf09ba435e"
> > +SRCREV = "b25c08bda4949192c69cea4cee057887341a2ffc"
> > 
> > -SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release"
> > +SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release \
> > +           file://fix-musl.patch \
> > +"
> > UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
> > 
> > S = "${WORKDIR}/git"
> > --
> > 2.17.1
> > 
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[prev in list] [next in list] [prev in thread] [next in thread]