diff --git a/packages/ninja/Dockerfile b/packages/ninja/Dockerfile new file mode 100644 index 0000000..c07270a --- /dev/null +++ b/packages/ninja/Dockerfile @@ -0,0 +1,41 @@ +FROM imgrep/busybox:latest as busybox +FROM imgrep/gcc:latest as gcc +FROM imgrep/binutils:latest as binutils +FROM imgrep/musl:latest as musl +FROM imgrep/make:latest as make +FROM imgrep/openssl:latest as openssl +FROM imgrep/python:latest as python + +FROM busybox as build +ENV SRC_SITE=https://github.com/martine/ninja/archive/ +ENV SRC_VERSION=1.9.0 +ENV SRC_HASH=5d7ec75828f8d3fd1a0c2f31b5b0cea780cdfe1031359228c428c1a48bfcd5b9 +RUN wget ${SRC_SITE}/v${SRC_VERSION}.tar.gz +RUN echo "${SRC_HASH} v${SRC_VERSION}.tar.gz" | sha256sum -c +RUN tar -xf v${SRC_VERSION}.tar.gz +WORKDIR ninja-${SRC_VERSION} +ADD fix-musl.patch . +RUN patch -p1 < fix-musl.patch +COPY --from=binutils . / +COPY --from=make . / +COPY --from=python . / +COPY --from=musl . / +COPY --from=gcc . / + +# HACK: figure out why gcc package puts these in the wrong path at install time +COPY --from=gcc /usr/lib64/* /usr/lib/ + +RUN set -eux; \ + python3 ./configure.py --bootstrap; \ + mkdir -p /home/user/rootfs/usr/bin/; \ + cp ninja /home/user/rootfs/usr/bin/ + +# HACK: figure out why gcc package puts these in the wrong path at install time +COPY --from=gcc /usr/lib64/* /home/user/rootfs/usr/lib/ +COPY --from=musl . /home/user/rootfs/ + +FROM scratch +COPY --from=build /home/user/rootfs / +USER 100:100 +ENTRYPOINT ["/usr/bin/ninja"] +CMD ["--version"] diff --git a/packages/ninja/fix-musl.patch b/packages/ninja/fix-musl.patch new file mode 100644 index 0000000..543d4f1 --- /dev/null +++ b/packages/ninja/fix-musl.patch @@ -0,0 +1,39 @@ +2ff54ad7478a90bd75c91e434236a Mon Sep 17 00:00:00 2001 +From: makepost +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