From 572edb6f68b84856c6ad5d4c93880b01ebd38163 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 1 Aug 2011 01:17:25 +0000 Subject: [PATCH] openjdk: Add patch to fix 'printf: --: invalid option' error Thanks to http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg510739.html for the fix svn path=/nixpkgs/trunk/; revision=28097 --- pkgs/development/compilers/openjdk/default.nix | 2 +- pkgs/development/compilers/openjdk/printf-fix.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/openjdk/printf-fix.patch diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 92bc9c0ff00..623896ae277 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c ''; - patches = [ ./cppflags-include-fix.patch ]; + patches = [ ./cppflags-include-fix.patch ./printf-fix.patch ]; makeFlags = [ "SORT=${coreutils}/bin/sort" diff --git a/pkgs/development/compilers/openjdk/printf-fix.patch b/pkgs/development/compilers/openjdk/printf-fix.patch new file mode 100644 index 00000000000..3d66962a119 --- /dev/null +++ b/pkgs/development/compilers/openjdk/printf-fix.patch @@ -0,0 +1,12 @@ +diff -Naur openjdk-orig/make/Defs-internal.gmk openjdk/make/Defs-internal.gmk +--- openjdk-orig/make/Defs-internal.gmk 2011-06-27 11:44:06.000000000 -0400 ++++ openjdk/make/Defs-internal.gmk 2011-07-31 18:30:15.784506762 -0400 +@@ -79,7 +79,7 @@ + # Find all build_time_* files and print their contents in a list sorted + # on the name of the sub repository. + define ReportBuildTimes +-$(PRINTF) "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \ ++$(PRINTF) -- "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \ + $1 \ + "`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \ + "`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \