mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
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
This commit is contained in:
parent
43cb8fb149
commit
572edb6f68
|
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||||
openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
|
openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
|
||||||
'';
|
'';
|
||||||
|
|
||||||
patches = [ ./cppflags-include-fix.patch ];
|
patches = [ ./cppflags-include-fix.patch ./printf-fix.patch ];
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
"SORT=${coreutils}/bin/sort"
|
"SORT=${coreutils}/bin/sort"
|
||||||
|
|
12
pkgs/development/compilers/openjdk/printf-fix.patch
Normal file
12
pkgs/development/compilers/openjdk/printf-fix.patch
Normal file
|
@ -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`" \
|
Loading…
Reference in a new issue