Merge pull request #150227 from trofi/enable-parallel-cdk

cdk: enable and fix parallel build
This commit is contained in:
Jörg Thalheim 2021-12-11 12:07:55 +00:00 committed by GitHub
commit 21c336e08c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 0 deletions

View File

@ -16,8 +16,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-xBbJh793tPGycD18XkM7qUWMi+Uma/RUy/gBrYfnKTY=";
};
patches = [
# Proposed upstream as https://lists.gnu.org/archive/html/bug-ncurses/2021-12/msg00004.html
./parallel.patch
];
enableParallelBuilding = true;
meta = with lib; {
description = "Curses development kit";
homepage = "https://invisible-island.net/cdk/";
license = licenses.bsdOriginal ;
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;

View File

@ -0,0 +1,13 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -296,7 +296,9 @@ LIB_OBJECT = @LIB_OBJECT@
all sources :: $(AUTO_SRC)
-$(OBJECTS) : include/cdk_config.h
+# make sure we generate all headers before trying
+# to build first source file.
+$(OBJECTS) : $(MY_HDR)
#
# Standard library directive.