Skip to content

Solaris 10 fixes #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alarixnia wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

Solaris 10 fixes #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b6aa29
bootstrap: Use system nawk on solaris 10
alarixnia Mar 26, 2025
95e1c08
mk: teach about wget on SunOS
alarixnia Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions bootstrap/bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,9 +776,7 @@ SunOS)
need_bsd_install=yes
use_bsdinstall=yes

# Use native nawk and sed if available on newer illumos.
/usr/bin/nawk --version 2>/dev/null | grep "awk version " >/dev/null
if [ $? -eq 0 ]; then
if [ -x "/usr/bin/nawk" ]; then
Copy link

@jperkin jperkin Mar 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not 100% sure this is correct, fuzzy memory says there was a nawk on Solaris 9 that pointed to the XPG4 awk which was unsufficient in some way. I don't recall all of the details as this was over 20 years ago now, but it's possible this was due to some of the tricker parts of the wrappers which are now somewhat obsolete with cwrappers (though are still used in bootstrap).

I guess it depends on if we want to keep supporting Solaris 9 and older.

Copy link
Author

@alarixnia alarixnia Mar 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not 100% sure this is correct, fuzzy memory says there was a nawk on Solaris 9 that pointed to the XPG4 awk which was unsufficient in some way. I don't recall all of the details as this was over 20 years ago now, but it's possible this was due to some of the tricker parts of the wrappers which are now somewhat obsolete with cwrappers (though are still used in bootstrap).

It seems to point to XPG4 awk on Solaris 10 too.

bootstrap_awk="/usr/bin/nawk"
elif [ ! -x "/usr/gnu/bin/awk" ]; then
need_awk=yes
Expand Down
3 changes: 3 additions & 0 deletions mk/tools/tools.SunOS.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,9 @@ TOOLS_PLATFORM.uniq?= /usr/bin/uniq
TOOLS_PLATFORM.unzip?= /usr/bin/unzip
.endif
TOOLS_PLATFORM.wc?= /usr/bin/wc
.if exists(/usr/sfw/bin/wget)
TOOLS_PLATFORM.wget?= /usr/sfw/bin/wget
.endif
TOOLS_PLATFORM.xargs?= /usr/bin/xargs
.if exists(/usr/bin/xz)
TOOLS_PLATFORM.xz?= /usr/bin/xz
Expand Down
Loading