Mercurial > people > ptisnovs > daily_tests
view tck7/patches/Icedtea7_forest/java-1.7.0-openjdk-disable-system-lcms.patch @ 1:72d52b764c79 draft
Added patches applied during IcedTea head, IcedTea7-2.1, IcedTea7-2.3 and IcedTea7-2.4 build.
author | Pavel Tisnovsky <ptisnovs@redhat.com> |
---|---|
date | Tue, 01 Apr 2014 11:51:10 +0200 |
parents | |
children |
line wrap: on
line source
--- openjdk/jdk/make/jdk_generic_profile.sh.sav +++ openjdk/jdk/make/jdk_generic_profile.sh @@ -405,23 +405,6 @@ export ZLIB_CFLAGS export ZLIB_LIBS -# Export variables for system LCMS -# LCMS_CFLAGS and LCMS_LIBS tell the compiler how to compile and -# link against lcms2 -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 jpeg # JPEG_CFLAGS and JPEG_LIBS tell the compiler how to compile and # link against libjpeg @@ -549,7 +532,6 @@ fi # IcedTea defaults; use system libraries -export SYSTEM_LCMS=true export SYSTEM_ZLIB=true export SYSTEM_JPEG=true export SYSTEM_PNG=true