forked from mirrors/nixpkgs
Merge pull request #104925 from kampka/libfaketime
libfaketime: fix build with clang
This commit is contained in:
commit
b53a83782c
|
@ -0,0 +1,25 @@
|
|||
From f974fe07de9e6820bb1de50b31e480296d1d97b7 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Kampka <christian@kampka.net>
|
||||
Date: Wed, 25 Nov 2020 20:09:50 +0100
|
||||
Subject: [PATCH] Remove unsupported clang flags
|
||||
|
||||
---
|
||||
src/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index f13a6bb..b305150 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -69,7 +69,7 @@ PREFIX ?= /usr/local
|
||||
LIBDIRNAME ?= /lib/faketime
|
||||
PLATFORM ?=$(shell uname)
|
||||
|
||||
-CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS)
|
||||
+CFLAGS += -std=gnu99 -Wall -Wextra -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS)
|
||||
ifeq ($(PLATFORM),SunOS)
|
||||
CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
|
||||
endif
|
||||
--
|
||||
2.28.0
|
||||
|
|
@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [
|
||||
./no-date-in-gzip-man-page.patch
|
||||
];
|
||||
] ++ (stdenv.lib.optionals stdenv.cc.isClang [
|
||||
# https://github.com/wolfcw/libfaketime/issues/277
|
||||
./0001-Remove-unsupported-clang-flags.patch
|
||||
]);
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs test src
|
||||
|
@ -24,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
PREFIX = placeholder "out";
|
||||
LIBDIRNAME = "/lib";
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type -Wno-error=format-truncation";
|
||||
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=cast-function-type -Wno-error=format-truncation";
|
||||
|
||||
checkInputs = [ perl ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue