Mercurial > hg > release > icedtea7-forest-2.3 > jdk
changeset 5383:ba975a730f4b
7163470: Licensee source bundle build failed with CipherSpi not found (7u4)
Reviewed-by: valeriep
author | coffeys |
---|---|
date | Sun, 06 May 2012 21:25:29 +0100 |
parents | 538f6eff4041 |
children | c91e36369a9f |
files | make/com/oracle/security/ucrypto/Makefile make/common/shared/Defs-java.gmk make/sun/security/ec/Makefile make/sun/security/mscapi/Makefile make/sun/security/pkcs11/Makefile |
diffstat | 5 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/make/com/oracle/security/ucrypto/Makefile Fri May 04 11:40:35 2012 +0100 +++ b/make/com/oracle/security/ucrypto/Makefile Sun May 06 21:25:29 2012 +0100 @@ -139,7 +139,7 @@ # CLASSDESTDIR = $(TEMPDIR)/classes JAVAHFLAGS = -bootclasspath \ - "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)" + "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)$(JCE_PATH)" include $(BUILDDIR)/common/Mapfile-vers.gmk include $(BUILDDIR)/common/Library.gmk
--- a/make/common/shared/Defs-java.gmk Fri May 04 11:40:35 2012 +0100 +++ b/make/common/shared/Defs-java.gmk Sun May 06 21:25:29 2012 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -135,7 +135,7 @@ # built implicitly/explicitly. # ifeq ($(wildcard $(SHARE_SRC)/classes/javax/crypto/Cipher.java),) - JCEFLAGS = $(CLASSPATH_SEPARATOR)$(LIBDIR)/jce.jar + JCE_PATH = $(CLASSPATH_SEPARATOR)$(LIBDIR)/jce.jar endif # Add the source level @@ -148,11 +148,11 @@ CLASS_VERSION = -target $(TARGET_CLASS_VERSION) JAVACFLAGS += $(CLASS_VERSION) JAVACFLAGS += -encoding ascii -JAVACFLAGS += "-Xbootclasspath:$(CLASSBINDIR)$(JCEFLAGS)" +JAVACFLAGS += "-Xbootclasspath:$(CLASSBINDIR)$(JCE_PATH)" JAVACFLAGS += $(OTHER_JAVACFLAGS) # Needed for javah -JAVAHFLAGS += -bootclasspath "$(CLASSBINDIR)$(JCEFLAGS)" +JAVAHFLAGS += -bootclasspath "$(CLASSBINDIR)$(JCE_PATH)" # Needed for javadoc to ensure it builds documentation # against the newly built classes
--- a/make/sun/security/ec/Makefile Fri May 04 11:40:35 2012 +0100 +++ b/make/sun/security/ec/Makefile Sun May 06 21:25:29 2012 +0100 @@ -156,7 +156,8 @@ $(PKGDIR)/ECDSASignature.java \ $(PKGDIR)/ECKeyPairGenerator.java - JAVAHFLAGS = -bootclasspath "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)" + JAVAHFLAGS = -bootclasspath \ + "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)$(JCE_PATH)" # # C and C++ files
--- a/make/sun/security/mscapi/Makefile Fri May 04 11:40:35 2012 +0100 +++ b/make/sun/security/mscapi/Makefile Sun May 06 21:25:29 2012 +0100 @@ -149,7 +149,9 @@ # Rules # CLASSDESTDIR = $(TEMPDIR)/classes -JAVAHFLAGS = -bootclasspath "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)" + +JAVAHFLAGS = -bootclasspath \ + "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)$(JCE_PATH)" include $(BUILDDIR)/common/Mapfile-vers.gmk
--- a/make/sun/security/pkcs11/Makefile Fri May 04 11:40:35 2012 +0100 +++ b/make/sun/security/pkcs11/Makefile Sun May 06 21:25:29 2012 +0100 @@ -147,7 +147,8 @@ # Rules # CLASSDESTDIR = $(TEMPDIR)/classes -JAVAHFLAGS = -bootclasspath "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)" +JAVAHFLAGS = -bootclasspath \ + "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)$(JCE_PATH)" include $(BUILDDIR)/common/Mapfile-vers.gmk