RFR 8046002: Move Ucrypto to the open jdk repo

[Phil Race]

hudson builds are now failing as below. Did this change below break dev ?


Compiling ec2_aff.c (for libsunec.so)
/localtools/solaris-amd64/SUNWspro/SS12u3-Solaris10u6/SS12u3-slim/bin/cc -DTRACING -DMACRO_MEMSYS_OPS -DBREAKPTS -DcpuIntel -Di586 -Damd64 -D_LITTLE_ENDIAN= -DSOLARIS -DARCH='"amd64"' -Damd64 -DDEBUG -DRELEASE='"1.9.0-ea-fastdebug"' -I/scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/jdk/src/java.base/share/native/include -I/scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/jdk/src/java.base/solaris/native/include -I/scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/jdk/src/java.base/unix/native/include -m64 -D__solaris__ -erroff=E_BAD_PRAGMA_PACK_VALUE -xc99=%none -xCC -errshort=tags -Xa -v -mt -W0,-noglobal -g -xs -KPIC -xstrconst -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B      -xO2 -Wu,-O2~yz -xregs=no%frameptr -I/localtools/solaris-amd64/SUNWspro/SS12u3-Solaris10u6/sysroot/usr/include  -DTHIS_FILE='"ec2_aff.c"' -c -xMMD -xMF /scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/build/solaris-amd64/jdk/objs/libsunec/ec2_aff.d.tmp -o /scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/build/solaris-amd64/jdk/objs/libsunec/ec2_aff.o /scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/jdk/src/jdk.crypto.ec/share/native/libsunec/impl/ec2_aff.c
/usr/bin/find /scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/build/solaris-amd64/jdk/modules/java.naming -type f -a \( -name FILE_NAME_THAT_DOESNT_EXIST  -o -name "*.class"  -o -name "*.dat" \) | /usr/bin/ggrep -f /scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/build/solaris-amd64/images/lib//_the.charsets.jar_include  | /usr/bin/gsed 's|/scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/build/solaris-amd64/jdk/modules/java.naming/|-C /scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/build/solaris-amd64/jdk/modules/java.naming |g' >> /scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/build/solaris-amd64/images/lib//_the.charsets.jar_contents
"/scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.h", line 45: warning: macro redefined: DEBUG
"/scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.c", line 181: undefined symbol: CK_AES_CTR_PARAMS
"/scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.c", line 182: syntax error before or at: )
"/scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.c", line 185: syntax error before or at: )
"/scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.c", line 186: syntax error before or at: )
"/scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.c", line 213: undefined symbol: CK_AES_CTR_PARAMS
"/scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.c", line 213: syntax error before or at: )
"/scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.c", line 61: warning: declaration can not follow a statement
cc: acomp failed for /scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/jdk/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto/nativeCrypto.c
Lib-jdk.crypto.ucrypto.gmk:35: recipe for target '/scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/build/solaris-amd64/jdk/objs/libj2ucrypto/nativeCrypto.o' failed
gmake[3]: *** [/scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/build/solaris-amd64/jdk/objs/libj2ucrypto/nativeCrypto.o] Error 2
gmake[3]: Leaving directory '/scratch/java_re/builds/workspace/9-2-build-solaris-amd64/jdk9-dev/1534/jdk/make/lib'
Main.gmk:182: recipe for target 'jdk.crypto.ucrypto-libs' failed
gmake[2]: *** [jdk.crypto.ucrypto-libs] Error 2
gmake[2]: *** Waiting for unfinished jobs....


-phil.


On 10/20/14 12:56 AM, Erik Joelsson wrote:
> Thanks, looks good.
>
> /Erik
>
> On 2014-10-18 01:48, Valerie Peng wrote:
>>
>> Ok, I have updated the Copy-java.base.gmk with your suggestion, i.e. 
>> folded the ifndef part into the previous ifeq.
>> Webrev updated:
>> http://cr.openjdk.java.net/~valeriep/8046002/webrev.02/
>>
>> Thanks!
>> Valerie
>>
>> On 10/16/2014 1:00 AM, Erik Joelsson wrote:
>>> Hello Valierie,
>>>
>>> In Copy-java.base.gmk, you could change the findstring construct to 
>>> a simple "ifeq ($(OPENJDK_TARGET_OS), windows)", perhaps even fold 
>>> the whole ifndef OPENJDK into the previous ifeq since they are now 
>>> the same.
>>>
>>> Otherwise it looks good to me.
>>>
>>> /Erik
>>>
>>> On 2014-10-15 20:46, Valerie Peng wrote:
>>>> Hi, build experts,
>>>>
>>>> Could you please review the build-related changes for 8046002: Move 
>>>> Ucrypto to the open jdk repo?
>>>> The rest (src/test) has been reviewed by my peers in security team.
>>>>
>>>> Bug: https://bugs.openjdk.java.net/browse/JDK-8046002
>>>> Webrev: http://cr.openjdk.java.net/~valeriep/8046002/webrev.01/
>>>>
>>>> Thanks,
>>>> Valerie
>>>
>