[BACK]Return to Makefile CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / lang / openjdk8

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /pkgsrc/lang/openjdk8/Makefile between version 1.4 and 1.5

version 1.4, 2015/02/10 11:44:32 version 1.5, 2015/02/12 06:19:59
Line 60  CHECK_PORTABILITY_SKIP+= hotspot/test/ru
Line 60  CHECK_PORTABILITY_SKIP+= hotspot/test/ru
 MAKE_ENV+=      JAVA_HOME=  MAKE_ENV+=      JAVA_HOME=
 MAKE_ENV+=      CLASSPATH=  MAKE_ENV+=      CLASSPATH=
   
 BUILDDIR=       ${WRKSRC}/build/${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/}-${MACHINE_ARCH:S/i386/x86/}-normal-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL}  BUILD_OPSYS=    ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/}
 LD_LIBRARY_PATH=        ${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}:${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/jli:${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/server  BUILD_ARCH=     ${MACHINE_ARCH:S/i386/x86/:S/sparc64/sparcv9/}
   LIBDIR_ARCH=    ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/}
   BUILDDIR=       ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH}-normal-${BUILD_VARIANT}-${BUILD_DEBUG_LEVEL}
   LD_LIBRARY_PATH=        ${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/jli:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/server
 CONFIGURE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH}  CONFIGURE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
 MAKE_ENV+=      LD_LIBRARY_PATH=${LD_LIBRARY_PATH}  MAKE_ENV+=      LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
 BUILDLINK_PASSTHRU_RPATHDIRS+=  ${PREFIX}/java/openjdk8/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}  BUILDLINK_PASSTHRU_RPATHDIRS+=  ${PREFIX}/java/openjdk8/jre/lib/${LIBDIR_ARCH}
   
 PLIST_SUBST+=   ARCH=${MACHINE_ARCH:S/x86_64/amd64/}  PLIST_SUBST+=   ARCH=${LIBDIR_ARCH}
 PLIST_SUBST+=   LOWER_OPSYS=${LOWER_OPSYS}  PLIST_SUBST+=   LOWER_OPSYS=${LOWER_OPSYS}
   
 .include "../../mk/compiler.mk"  .include "../../mk/compiler.mk"
Line 132  post-extract:
Line 135  post-extract:
         ${LN} -s ${JDK_BOOTDIR}/bin/native2ascii ${ALT_BOOTDIR}/bin          ${LN} -s ${JDK_BOOTDIR}/bin/native2ascii ${ALT_BOOTDIR}/bin
         ${LN} -s ${JDK_BOOTDIR}/bin/rmic ${ALT_BOOTDIR}/bin          ${LN} -s ${JDK_BOOTDIR}/bin/rmic ${ALT_BOOTDIR}/bin
 .elif ${OPSYS} == "NetBSD" && exists(${.CURDIR}/libs)  .elif ${OPSYS} == "NetBSD" && exists(${.CURDIR}/libs)
         cp ${.CURDIR}/libs/lib* ${ALT_BOOTDIR}/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}          cp ${.CURDIR}/libs/lib* ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}
 .endif  .endif
   
 do-build: ${WRKDIR}/stage3-done  do-build: ${WRKDIR}/stage3-done
Line 145  ${WRKDIR}/stage1-done:
Line 148  ${WRKDIR}/stage1-done:
 .for d in corba hotspot jaxp jaxws langtools tmp  .for d in corba hotspot jaxp jaxws langtools tmp
         mv ${BUILDDIR}/${d} ${BUILDDIR}/${d}-stage1          mv ${BUILDDIR}/${d} ${BUILDDIR}/${d}-stage1
 .endfor  .endfor
         touch ${WRKDIR}/stage1-done          touch ${.TARGET}
   
   # stage 1.5 reconfigures, since the bootstrap JDK major version might have changed now
   ${WRKDIR}/stage1_5-done: ${WRKDIR}/stage1-done
           ${RECURSIVE_MAKE} ${MAKEFLAGS} do-configure
           touch ${.TARGET}
   
 # stage 2 rebuilds the JDK using native tools  # stage 2 rebuilds the JDK using native tools
 ${WRKDIR}/stage2-done: ${WRKDIR}/stage1-done  ${WRKDIR}/stage2-done: ${WRKDIR}/stage1_5-done
         ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} images          ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_ENV_STAGE2} ${MAKE_PROGRAM} images
         touch ${WRKDIR}/stage2-done          touch ${.TARGET}
   
 # stage 3 builds third party add-ons  # stage 3 builds third party add-ons
 ${WRKDIR}/stage3-done: ${WRKDIR}/stage2-done ${WRKDIR}/cacerts.out  ${WRKDIR}/stage3-done: ${WRKDIR}/stage2-done ${WRKDIR}/cacerts.out
         touch ${WRKDIR}/stage3-done          touch ${.TARGET}
   
 ${WRKDIR}/cacerts.out:  ${WRKDIR}/cacerts.out:
         mkdir ${WRKDIR}/cacerts && cd ${WRKDIR}/cacerts &&              \          mkdir ${WRKDIR}/cacerts && cd ${WRKDIR}/cacerts &&              \
Line 192  TOOLS_PLATFORM.unzip=
Line 200  TOOLS_PLATFORM.unzip=
 .include "../../fonts/fontconfig/buildlink3.mk"  .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"  .include "../../graphics/freetype2/buildlink3.mk"
 BUILDLINK_DEPMETHOD.cups?=      build  BUILDLINK_DEPMETHOD.cups?=      build
 .include "../../print/cups15/buildlink3.mk"  .include "../../print/cups/buildlink3.mk"
 .include "../../mk/java-env.mk"  .include "../../mk/java-env.mk"
 .include "../../mk/bsd.pkg.mk"  .include "../../mk/bsd.pkg.mk"

Legend:
Removed from v.1.4  
changed lines
  Added in v.1.5

CVSweb <webmaster@jp.NetBSD.org>