OpenJDK / jdk / hs
changeset 41039:54596b00162b
8165163: Solaris11 and onwards provide CUPS by default, references to csw and sfw versions should be removed
Reviewed-by: erikj
| author | alanbur |
|---|---|
| date | Wed, 21 Sep 2016 14:16:05 +0200 |
| parents | 23d98594d9bd |
| children | 7b919a4497ff |
| files | README-builds.html README-builds.md common/autoconf/generated-configure.sh common/autoconf/lib-cups.m4 |
| diffstat | 4 files changed, 3 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/README-builds.html Tue Sep 20 16:56:04 2016 +0300 +++ b/README-builds.html Wed Sep 21 14:16:05 2016 +0200 @@ -626,8 +626,7 @@ <p>The Common UNIX Printing System (CUPS) Headers are required for building the OpenJDK on Solaris and Linux. The Solaris header files can be obtained by - installing the package <strong>SFWcups</strong> from the Solaris Software Companion - CD/DVD, these often will be installed into the directory <code>/opt/sfw/cups</code>.</p> + installing the package <strong>print/cups</strong>.</p> <p>The CUPS header files can always be downloaded from <a href="http://www.cups.org">www.cups.org</a>.</p>
--- a/README-builds.md Tue Sep 20 16:56:04 2016 +0300 +++ b/README-builds.md Wed Sep 21 14:16:05 2016 +0200 @@ -560,8 +560,7 @@ > The Common UNIX Printing System (CUPS) Headers are required for building the OpenJDK on Solaris and Linux. The Solaris header files can be obtained by - installing the package **SFWcups** from the Solaris Software Companion - CD/DVD, these often will be installed into the directory `/opt/sfw/cups`. + installing the package **print/cups**. > The CUPS header files can always be downloaded from [www.cups.org](http://www.cups.org).
--- a/common/autoconf/generated-configure.sh Tue Sep 20 16:56:04 2016 +0300 +++ b/common/autoconf/generated-configure.sh Wed Sep 21 14:16:05 2016 +0200 @@ -5095,7 +5095,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1472718471 +DATE_WHEN_GENERATED=1474459654 ############################################################################### # @@ -56911,23 +56911,6 @@ fi if test "x$CUPS_FOUND" = xno; then - # Getting nervous now? Lets poke around for standard Solaris third-party - # package installation locations. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cups headers" >&5 -$as_echo_n "checking for cups headers... " >&6; } - if test -s $SYSROOT/opt/sfw/cups/include/cups/cups.h; then - # An SFW package seems to be installed! - CUPS_FOUND=yes - CUPS_CFLAGS="-I$SYSROOT/opt/sfw/cups/include" - elif test -s $SYSROOT/opt/csw/include/cups/cups.h; then - # A CSW package seems to be installed! - CUPS_FOUND=yes - CUPS_CFLAGS="-I$SYSROOT/opt/csw/include" - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_FOUND" >&5 -$as_echo "$CUPS_FOUND" >&6; } - fi - if test "x$CUPS_FOUND" = xno; then # Print a helpful message on how to acquire the necessary build dependency. # cups is the help tag: freetype, cups, alsa etc
--- a/common/autoconf/lib-cups.m4 Tue Sep 20 16:56:04 2016 +0300 +++ b/common/autoconf/lib-cups.m4 Wed Sep 21 14:16:05 2016 +0200 @@ -76,21 +76,6 @@ ]) fi if test "x$CUPS_FOUND" = xno; then - # Getting nervous now? Lets poke around for standard Solaris third-party - # package installation locations. - AC_MSG_CHECKING([for cups headers]) - if test -s $SYSROOT/opt/sfw/cups/include/cups/cups.h; then - # An SFW package seems to be installed! - CUPS_FOUND=yes - CUPS_CFLAGS="-I$SYSROOT/opt/sfw/cups/include" - elif test -s $SYSROOT/opt/csw/include/cups/cups.h; then - # A CSW package seems to be installed! - CUPS_FOUND=yes - CUPS_CFLAGS="-I$SYSROOT/opt/csw/include" - fi - AC_MSG_RESULT([$CUPS_FOUND]) - fi - if test "x$CUPS_FOUND" = xno; then HELP_MSG_MISSING_DEPENDENCY([cups]) AC_MSG_ERROR([Could not find cups! $HELP_MSG ]) fi