JDK-8311938: Add default cups include location for configure on AIX #15100

ansteiner · 2023-08-01T07:28:02Z

Add the default include location(/opt/freeware/include/) for cups on AIX. With this set the additional configure parameter --with-cups-include can be removed, which was needed on AIX.

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8311938: Add default cups include location for configure on AIX (Enhancement - P4)

Reviewers

Christoph Langer (@RealCLanger - Reviewer)
Matthias Baesken (@MBaesken - Reviewer) ⚠️ Review applies to 8894c726
Julian Waters (@TheShermanTanker - Committer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/15100/head:pull/15100
$ git checkout pull/15100

Update a local copy of the PR:
$ git checkout pull/15100
$ git pull https://git.openjdk.org/jdk.git pull/15100/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15100

View PR using the GUI difftool:
$ git pr show -t 15100

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/15100.diff

Webrev

Link to Webrev Comment

bridgekeeper · 2023-08-01T07:29:18Z

👋 Welcome back ansteiner! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2023-08-01T07:30:41Z

@ansteiner The following labels will be automatically applied to this pull request:

build
client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

mlbridge · 2023-08-01T07:35:05Z

Webrevs

RealCLanger

I think the check for the cups default location on AIX fits better in the next section, after line 70/79 # Are the cups headers installed in the default /usr/include location?

But other than that, looks good to me.

MBaesken · 2023-08-01T07:51:58Z

Looks reasonable, but you would overwrite the with_cups setting on AIX, is this intended (see line 50 in the same file) ?
Otherwise the COPYRIGHT year needs adjutment.

openjdk · 2023-08-01T07:52:49Z

@ansteiner This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8311938: Add default cups include location for configure on AIX

Reviewed-by: clanger, mbaesken, jwaters

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 63 new commits pushed to the master branch:

10a2605: 8294979: test/jdk/tools/jlink 3 test classes use ASM library
e8c325d: 8313394: Array Elements in OldObjectSample event has the incorrect description
d60352e: 8311006: missing @SInCE info in jdk.xml.dom
4577147: 8313712: [BACKOUT] 8313632: ciEnv::dump_replay_data use fclose
bb3aac6: 8301606: JFileChooser file chooser details view "size" label cut off in Metal Look&Feel
0f2fce7: 8313632: ciEnv::dump_replay_data use fclose
ab1c212: 8312909: C1 should not inline through interface calls with non-subtype receiver
c386091: 8312984: javac may crash on a record pattern with too few components
3212b64: 8313582: Problemlist failing test on linux x86
bdac348: 8313602: increase timeout for jdk/classfile/CorpusTest.java
... and 53 more: https://git.openjdk.org/jdk/compare/d9559f9b24ee76c074cefcaf256d11ef5a7cc5b7...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@RealCLanger, @MBaesken, @TheShermanTanker) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

…e copyright year

ansteiner · 2023-08-01T12:42:14Z

@MBaesken: Thanks for the hint about with_cups. The default cups include location will be set in case with_cups is not set only and I updated the copyright year.

RealCLanger

Hm, I still think it's clearer to have the AIX default cups check in the next section after if test "x$CUPS_FOUND" = xno; then.
Currently, if somebody sets both, --with-cups= and --with-cups-include, with-cups-include gets precedence. The problem is only theoretical, I guess but I'd find it better if it were:
if test "x${with_cups}" != x; then
...
elif test "x${with_cups_include}" != x; then
...
fi

and then
if test "x$CUPS_FOUND" = xno; then
Are the cups headers installed in the default /usr/include location?
if aix
...
else
...
fi
fi

ansteiner · 2023-08-02T11:06:10Z

Currently, if somebody sets both, --with-cups= and --with-cups-include, with-cups-include gets precedence. The problem is only theoretical

The default for with-cups-include on AIX will be set only if --with-cups is not set. See my last commit. But I will think about your suggestion to do the check in the other section...

MBaesken · 2023-08-02T12:30:34Z

Moving the check down a bit into a
if test "x$CUPS_FOUND" = xno; then
section might have a little benefit , it would detect cups headers on AIX at the standard location in case a bad non working path has been set with '-with-cups' or 'with-cups-include' . But I am okay with both.

RealCLanger

Looks good. Maybe you should also set DEFAULT_CUPS=yes, although it doesn't seem to be used anywhere.

RealCLanger

Nearly perfect now. 😄

TheShermanTanker

Looks good, sorry I missed this until now

ansteiner · 2023-08-04T06:17:35Z

/integrate

openjdk · 2023-08-04T06:19:06Z

@ansteiner
Your change (at version c8575b1) is now ready to be sponsored by a Committer.

MBaesken · 2023-08-04T06:55:43Z

/sponsor

openjdk · 2023-08-04T06:56:14Z

Going to push as commit c4b8574.
Since your change was applied there have been 63 commits pushed to the master branch:

10a2605: 8294979: test/jdk/tools/jlink 3 test classes use ASM library
e8c325d: 8313394: Array Elements in OldObjectSample event has the incorrect description
d60352e: 8311006: missing @SInCE info in jdk.xml.dom
4577147: 8313712: [BACKOUT] 8313632: ciEnv::dump_replay_data use fclose
bb3aac6: 8301606: JFileChooser file chooser details view "size" label cut off in Metal Look&Feel
0f2fce7: 8313632: ciEnv::dump_replay_data use fclose
ab1c212: 8312909: C1 should not inline through interface calls with non-subtype receiver
c386091: 8312984: javac may crash on a record pattern with too few components
3212b64: 8313582: Problemlist failing test on linux x86
bdac348: 8313602: increase timeout for jdk/classfile/CorpusTest.java
... and 53 more: https://git.openjdk.org/jdk/compare/d9559f9b24ee76c074cefcaf256d11ef5a7cc5b7...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-08-04T06:56:24Z

@MBaesken @ansteiner Pushed as commit c4b8574.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

JDK-8311938: Add default cups include location for configure on AIX

6481f42

openjdk bot added the rfr Pull request is ready for review label Aug 1, 2023

openjdk bot added build build-dev@openjdk.org client client-libs-dev@openjdk.org labels Aug 1, 2023

RealCLanger approved these changes Aug 1, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Aug 1, 2023

set default cups include location if with_cups is not set only, updat…

8894c72

…e copyright year

MBaesken approved these changes Aug 1, 2023

View reviewed changes

RealCLanger reviewed Aug 1, 2023

View reviewed changes

move AIX check to default location section

955f302

RealCLanger approved these changes Aug 2, 2023

View reviewed changes

use AC_CHECK_HEADERS for AIX default location too

c8575b1

RealCLanger approved these changes Aug 3, 2023

View reviewed changes

TheShermanTanker approved these changes Aug 3, 2023

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 4, 2023

openjdk bot added the integrated Pull request has been integrated label Aug 4, 2023

openjdk bot closed this Aug 4, 2023

openjdk bot removed the ready Pull request is ready to be integrated label Aug 4, 2023

openjdk bot removed rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Aug 4, 2023

ansteiner deleted the JDK-8311938 branch August 4, 2023 07:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

JDK-8311938: Add default cups include location for configure on AIX #15100

JDK-8311938: Add default cups include location for configure on AIX #15100

ansteiner commented Aug 1, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Aug 1, 2023

openjdk bot commented Aug 1, 2023

mlbridge bot commented Aug 1, 2023 •

edited

Loading

RealCLanger left a comment

MBaesken commented Aug 1, 2023

openjdk bot commented Aug 1, 2023 •

edited

Loading

ansteiner commented Aug 1, 2023

RealCLanger left a comment •

edited

Loading

ansteiner commented Aug 2, 2023

MBaesken commented Aug 2, 2023

RealCLanger left a comment

RealCLanger left a comment

TheShermanTanker left a comment

ansteiner commented Aug 4, 2023

openjdk bot commented Aug 4, 2023

MBaesken commented Aug 4, 2023

openjdk bot commented Aug 4, 2023

openjdk bot commented Aug 4, 2023

JDK-8311938: Add default cups include location for configure on AIX #15100

JDK-8311938: Add default cups include location for configure on AIX #15100

Conversation

ansteiner commented Aug 1, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Aug 1, 2023

openjdk bot commented Aug 1, 2023

mlbridge bot commented Aug 1, 2023 • edited Loading

Webrevs

RealCLanger left a comment

Choose a reason for hiding this comment

MBaesken commented Aug 1, 2023

openjdk bot commented Aug 1, 2023 • edited Loading

ansteiner commented Aug 1, 2023

RealCLanger left a comment • edited Loading

Choose a reason for hiding this comment

ansteiner commented Aug 2, 2023

MBaesken commented Aug 2, 2023

RealCLanger left a comment

Choose a reason for hiding this comment

RealCLanger left a comment

Choose a reason for hiding this comment

TheShermanTanker left a comment

Choose a reason for hiding this comment

ansteiner commented Aug 4, 2023

openjdk bot commented Aug 4, 2023

MBaesken commented Aug 4, 2023

openjdk bot commented Aug 4, 2023

openjdk bot commented Aug 4, 2023

ansteiner commented Aug 1, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Aug 1, 2023 •

edited

Loading

openjdk bot commented Aug 1, 2023 •

edited

Loading

RealCLanger left a comment •

edited

Loading