host_os_name value in config-scripts has changed to 'solaris'#704
host_os_name value in config-scripts has changed to 'solaris'#704michaelrsweet merged 5 commits intoOpenPrinting:masterfrom l1gi:master
Conversation
|
Could I kindly ask you to review this Solaris specific change, please? Thank you, |
|
Make sure to run autoconf --force @l1gi |
|
@AtariDreams NEVER run "aclocal" on the CUPS repository - it will damage the config.h.in file and render the local sources unbuildable. We do not use automake or aclocal, just autoconf ( |
|
@l1gi I've been in standards meetings all week, but just FYI it is not reasonable to expect code review after 6 hours. |
michaelrsweet
left a comment
There was a problem hiding this comment.
Please respond to my question about /system. Also, you missed the sunos reference in the cups-threads.m4 file.
| # Darwin (macOS) | ||
| CUPS_STATEDIR="$CUPS_SERVERROOT" | ||
| ], [solaris*], [ | ||
| CUPS_STATEDIR="/system/volatile/cups" |
There was a problem hiding this comment.
Not having used a recent version of Solaris, this looks like something that needs more checking - certainly the last version of Solaris that CUPS actually supported did not have a /system hierarchy, so I'd expect there to be a directory existence check.
|
Hi Michael, thanks for looking into this. Your objections caused I did more testing on how that behaves on Solaris 10 and I must say I was wrong. Even on Solaris 10 (which is the last Oracle supports) the host_os_name is already solaris. So the question is how sunos got there and whether we should keep it or replace it by solaris. What do you think (or remember)? :) Solaris 11 builds with or without -D_POSIX_PTHREAD_SEMANTICS, but Solaris 10 needs this. I will take care of this one also. Thanks for any advice, |
|
WRT what Anyways, checking the config.sub/guess scripts, it looks like they still report sunos on platforms that are running pre-Solaris builds (if you'd even be able to get working hardware for that!) so for now let's use both sunos and solaris in the configure scripts. |
That's true of course:
Okay, so I have just added |
|
@michaelrsweet Thoughts? |
michaelrsweet
left a comment
There was a problem hiding this comment.
Still needs a few tweaks...
| CUPS_STATEDIR="$CUPS_SERVERROOT" | ||
| ], [sun* | solaris*], [ | ||
| AS_IF([test -d /system/volatile], [ | ||
| CUPS_STATEDIR="/system/volatile/cups" |
There was a problem hiding this comment.
Need an 'else' clause for this.
| # Solaris requires -D_POSIX_PTHREAD_SEMANTICS to be POSIX- | ||
| # compliant... :( | ||
| AS_IF([test $host_os_name = sunos], [ | ||
| AS_IF([test $host_os_name = solaris], [ |
There was a problem hiding this comment.
Needs to look for both sunos and solaris here, something like:
AS_IF([test $host_os_name = sunos -o $host_os_name = solaris], [
|
Let me know if it's okay now. Thank you, |
michaelrsweet
left a comment
There was a problem hiding this comment.
Looks good now, thank you!
Variable host_os_name value has changed on Solaris from sunos to solaris some time ago. This change updates config-scripts to keep values used for Solaris 5.10 (sunos), but also sets relevant options on Solaris 5.11 (solaris). This change decreases the number of configure options necessary to build CUPS on current Solaris.
Please consider merge.
Thank you,
m.