uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
45
pkgs/tools/networking/ntp/default.nix
Normal file
45
pkgs/tools/networking/ntp/default.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ stdenv, lib, fetchurl, openssl, perl, pps-tools, libcap }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ntp";
|
||||
version = "4.2.8p15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${lib.versions.majorMinor version}/ntp-${version}.tar.gz";
|
||||
sha256 = "06cwhimm71safmwvp6nhxp6hvxsg62whnbgbgiflsqb8mgg40n7n";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# From https://patchwork.openembedded.org/patch/180019/
|
||||
./glibc-2.34-fix.patch
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
"--with-openssl-libdir=${lib.getLib openssl}/lib"
|
||||
"--with-openssl-incdir=${openssl.dev}/include"
|
||||
"--enable-ignore-dns-errors"
|
||||
"--with-yielding-select=yes"
|
||||
] ++ lib.optional stdenv.isLinux "--enable-linuxcaps";
|
||||
|
||||
buildInputs = [ openssl perl ]
|
||||
++ lib.optionals stdenv.isLinux [ pps-tools libcap ];
|
||||
|
||||
hardeningEnable = [ "pie" ];
|
||||
|
||||
postInstall = ''
|
||||
rm -rf $out/share/doc
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.ntp.org/";
|
||||
description = "An implementation of the Network Time Protocol";
|
||||
license = {
|
||||
# very close to isc and bsd2
|
||||
url = "https://www.eecis.udel.edu/~mills/ntp/html/copyright.html";
|
||||
};
|
||||
maintainers = with maintainers; [ eelco thoughtpolice ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
28
pkgs/tools/networking/ntp/glibc-2.34-fix.patch
Normal file
28
pkgs/tools/networking/ntp/glibc-2.34-fix.patch
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
From 082a504cfcc046c3d8adaae1164268bc94e5108a Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 31 Jul 2021 10:51:41 -0700
|
||||
Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc
|
||||
In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which
|
||||
could mean different stack sizes at runtime on different architectures
|
||||
and it also causes compile failure. Default glibc thread stack size
|
||||
or 64Kb set by ntp should be good in glibc these days.
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
libntp/work_thread.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
diff --git a/libntp/work_thread.c b/libntp/work_thread.c
|
||||
index 03a5647..3ddd751 100644
|
||||
--- a/libntp/work_thread.c
|
||||
+++ b/libntp/work_thread.c
|
||||
@@ -41,7 +41,7 @@
|
||||
#ifndef THREAD_MINSTACKSIZE
|
||||
# define THREAD_MINSTACKSIZE (64U * 1024)
|
||||
#endif
|
||||
-#ifndef __sun
|
||||
+#if !defined(__sun) && !defined(__GLIBC__)
|
||||
#if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN
|
||||
# undef THREAD_MINSTACKSIZE
|
||||
# define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN
|
||||
--
|
||||
2.32.0
|
||||
Loading…
Add table
Add a link
Reference in a new issue