view remove-intree-libraries.sh.in @ 2678:9d8be6bbedf8

PR3681: Use the internal copy of the SunEC library rather than statically linking against NSS 2019-01-08 Andrew John Hughes <gnu_andrew@member.fsf.org> PR3681: Use the internal copy of the SunEC library rather than statically linking against NSS * patches/disable-intree-ec.patch: Removed. * patches/nss-config.patch: Removed. * patches/nss-not-enabled-config.patch: Removed. * patches/nss-not-enabled-config-with-sunec.patch: Renamed to patches/pkcs11-nss-not-enabled-config.patch. * patches/nss-config-with-sunec.patch: Renamed to patches/pkcs11-nss-config.patch. * INSTALL: Remove --enable-sunec option. Update documentation to match current situation with SunEC. * Makefile.am: (ICEDTEA_PATCHES): Remove disable-intree-ec.patch. Remove PKCS11 config patches without the SunEC provider. Rename remaining two to make it clear they are for the PKCS11 provider. (ICEDTEA_CONFIGURE): Remove use of system-nss option which no longer exists, following PR3681. (ICEDTEA_ENV): Remove NSS_LIBS and NSS_CFLAGS. (check-ecc): Argument passed to the test should now be "yes". * NEWS: Updated. * acinclude.m4: (IT_ENABLE_SUNEC): Removed. * configure.ac: Replace IT_ENABLE_SUNEC call with IT_LOCATE_NSS. * fsg.sh.in: Remove unused source code and use new PR3681 patch instead of old PR2126 patch which only alters Java code. * patches/pr3681.patch: Renamed from patches/pr2126.patch, updated to OpenJDK 9 paths and extended to patch native code. * patches/rh1022017.patch: Updated to OpenJDK 9 paths. * remove-intree-libraries.sh.in: Drop conditional removal of SunEC code. 2018-02-15 Andrew John Hughes <gnu_andrew@member.fsf.org> * patches/pr2126.patch, * patches/rh1022017.patch: Fix file paths due to 8156502 dropping 'Supported' from the front of 'SupportedEllipticCurvesExtension.java' 2017-12-11 Andrew John Hughes <gnu_andrew@member.fsf.org> * patches/pr2126.patch: Update to apply against 8u152, following 8157035. 2017-01-23 Andrew John Hughes <gnu_andrew@member.fsf.org> * patches/pr2126.patch: Extend following changes made in 8148516. 2016-11-07 Andrew John Hughes <gnu_andrew@member.fsf.org> * patches/pr2126.patch: Remove Brainpool curves added by 8146490. 2016-04-23 Andrew John Hughes <gnu_andrew@member.fsf.org> PR3681: Use the internal copy of the SunEC library rather than statically linking against NSS * Makefile.am: (ECC_RESULT): Removed.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Fri, 11 Jan 2019 03:32:22 +0000
parents a84cfe9142fd
children
line wrap: on
line source

#!/bin/sh

ZLIB_VERSION=1.2.8
ZIP_SRC=openjdk/jdk/src/share/native/java/util/zip/zlib-${ZLIB_VERSION}
JPEG_SRC=openjdk/jdk/src/share/native/sun/awt/image/jpeg
GIF_SRC=openjdk/jdk/src/share/native/sun/awt/giflib
PNG_SRC=openjdk/jdk/src/share/native/sun/awt/libpng
LCMS_SRC=openjdk/jdk/src/share/native/sun/java2d/cmm/lcms

if test "x@ENABLE_SYSTEM_ZLIB@" = "xyes"; then
  echo "Removing zlib"
  rm -rvf ${ZIP_SRC}
fi

if test "x@ENABLE_SYSTEM_JPEG@" = "xyes"; then
  echo "Removing libjpeg"
  rm -vf ${JPEG_SRC}/jcapimin.c
  rm -vf ${JPEG_SRC}/jcapistd.c
  rm -vf ${JPEG_SRC}/jccoefct.c
  rm -vf ${JPEG_SRC}/jccolor.c
  rm -vf ${JPEG_SRC}/jcdctmgr.c
  rm -vf ${JPEG_SRC}/jchuff.c
  rm -vf ${JPEG_SRC}/jchuff.h
  rm -vf ${JPEG_SRC}/jcinit.c
  rm -vf ${JPEG_SRC}/jcmainct.c
  rm -vf ${JPEG_SRC}/jcmarker.c
  rm -vf ${JPEG_SRC}/jcmaster.c
  rm -vf ${JPEG_SRC}/jcomapi.c
  rm -vf ${JPEG_SRC}/jconfig.h
  rm -vf ${JPEG_SRC}/jcparam.c
  rm -vf ${JPEG_SRC}/jcphuff.c
  rm -vf ${JPEG_SRC}/jcprepct.c
  rm -vf ${JPEG_SRC}/jcsample.c
  rm -vf ${JPEG_SRC}/jctrans.c
  rm -vf ${JPEG_SRC}/jdapimin.c
  rm -vf ${JPEG_SRC}/jdapistd.c
  rm -vf ${JPEG_SRC}/jdcoefct.c
  rm -vf ${JPEG_SRC}/jdcolor.c
  rm -vf ${JPEG_SRC}/jdct.h
  rm -vf ${JPEG_SRC}/jddctmgr.c
  rm -vf ${JPEG_SRC}/jdhuff.c
  rm -vf ${JPEG_SRC}/jdhuff.h
  rm -vf ${JPEG_SRC}/jdinput.c
  rm -vf ${JPEG_SRC}/jdmainct.c
  rm -vf ${JPEG_SRC}/jdmarker.c
  rm -vf ${JPEG_SRC}/jdmaster.c
  rm -vf ${JPEG_SRC}/jdmerge.c
  rm -vf ${JPEG_SRC}/jdphuff.c
  rm -vf ${JPEG_SRC}/jdpostct.c
  rm -vf ${JPEG_SRC}/jdsample.c
  rm -vf ${JPEG_SRC}/jdtrans.c
  rm -vf ${JPEG_SRC}/jfdctflt.c
  rm -vf ${JPEG_SRC}/jfdctfst.c
  rm -vf ${JPEG_SRC}/jfdctint.c
  rm -vf ${JPEG_SRC}/jerror.c
  rm -vf ${JPEG_SRC}/jerror.h
  rm -vf ${JPEG_SRC}/jidctflt.c
  rm -vf ${JPEG_SRC}/jidctfst.c
  rm -vf ${JPEG_SRC}/jidctint.c
  rm -vf ${JPEG_SRC}/jidctred.c
  rm -vf ${JPEG_SRC}/jinclude.h
  rm -vf ${JPEG_SRC}/jmemmgr.c
  rm -vf ${JPEG_SRC}/jmemnobs.c
  rm -vf ${JPEG_SRC}/jmemsys.h
  rm -vf ${JPEG_SRC}/jmorecfg.h
  rm -vf ${JPEG_SRC}/jpegint.h
  rm -vf ${JPEG_SRC}/jpeglib.h
  rm -vf ${JPEG_SRC}/jquant1.c
  rm -vf ${JPEG_SRC}/jquant2.c
  rm -vf ${JPEG_SRC}/jutils.c
  rm -vf ${JPEG_SRC}/jversion.h
  rm -vf ${JPEG_SRC}/README
fi

if test "x@ENABLE_SYSTEM_GIF@" = "xyes"; then
  echo "Removing giflib"
  rm -rvf ${GIF_SRC}
fi

if test "x@ENABLE_SYSTEM_PNG@" = "xyes"; then
  echo "Removing libpng"
  rm -rvf ${PNG_SRC}
fi

if test "x@ENABLE_SYSTEM_LCMS@" = "xyes"; then
  echo "Removing lcms"
  rm -vf ${LCMS_SRC}/cmscam02.c
  rm -vf ${LCMS_SRC}/cmscgats.c
  rm -vf ${LCMS_SRC}/cmscnvrt.c
  rm -vf ${LCMS_SRC}/cmserr.c
  rm -vf ${LCMS_SRC}/cmsgamma.c
  rm -vf ${LCMS_SRC}/cmsgmt.c
  rm -vf ${LCMS_SRC}/cmshalf.c
  rm -vf ${LCMS_SRC}/cmsintrp.c
  rm -vf ${LCMS_SRC}/cmsio0.c
  rm -vf ${LCMS_SRC}/cmsio1.c
  rm -vf ${LCMS_SRC}/cmslut.c
  rm -vf ${LCMS_SRC}/cmsmd5.c
  rm -vf ${LCMS_SRC}/cmsmtrx.c
  rm -vf ${LCMS_SRC}/cmsnamed.c
  rm -vf ${LCMS_SRC}/cmsopt.c
  rm -vf ${LCMS_SRC}/cmspack.c
  rm -vf ${LCMS_SRC}/cmspcs.c
  rm -vf ${LCMS_SRC}/cmsplugin.c
  rm -vf ${LCMS_SRC}/cmsps2.c
  rm -vf ${LCMS_SRC}/cmssamp.c
  rm -vf ${LCMS_SRC}/cmssm.c
  rm -vf ${LCMS_SRC}/cmstypes.c
  rm -vf ${LCMS_SRC}/cmsvirt.c
  rm -vf ${LCMS_SRC}/cmswtpnt.c
  rm -vf ${LCMS_SRC}/cmsxform.c
  rm -vf ${LCMS_SRC}/lcms2.h
  rm -vf ${LCMS_SRC}/lcms2_internal.h
  rm -vf ${LCMS_SRC}/lcms2_plugin.h
fi