Mercurial > people > ptisnovs > daily_tests
view tck7/patches/Icedtea7_forest_2_1/java-1.7.0-openjdk-disable-system-lcms.patch @ 7:3db8bad5b608 draft
Added three scripts used to rerun compiler tests for all three tested JDKs.
author | Pavel Tisnovsky <ptisnovs@redhat.com> |
---|---|
date | Wed, 09 Apr 2014 13:18:08 +0200 |
parents | 72d52b764c79 |
children |
line wrap: on
line source
--- openjdk/jdk/make/jdk_generic_profile.sh.sav +++ openjdk/jdk/make/jdk_generic_profile.sh @@ -381,24 +381,6 @@ fi fi -# Export variables for system LCMS -# LCMS_CFLAGS and LCMS_LIBS tell the compiler how to compile and -# link against lcms2 -pkgconfig=$(which pkg-config 2>/dev/null) -if [ -x "${pkgconfig}" ] ; then - if [ "${LCMS_CFLAGS}" = "" ] ; then - LCMS_CFLAGS=$("${pkgconfig}" --cflags lcms2) - fi - if [ "${LCMS_LIBS}" = "" ] ; then - LCMS_LIBS=$("${pkgconfig}" --libs lcms2) - fi -fi -if [ "${LCMS_LIBS}" = "" ] ; then - LCMS_LIBS="-llcms2" -fi -export LCMS_CFLAGS -export LCMS_LIBS - # Export variables for system zlib # ZLIB_CFLAGS and ZLIB_LIBS tell the compiler how to compile and # link against zlib @@ -452,7 +434,6 @@ export GIF_LIBS # IcedTea defaults; use system libraries -export USE_SYSTEM_LCMS=true export USE_SYSTEM_ZLIB=true export USE_SYSTEM_JPEG=true export USE_SYSTEM_PNG=true