Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make awk script compatible with default Solaris /usr/bin/awk

Browse Source 
See #18950
This commit is contained in:
Paul Cornett
2020-10-25 23:31:47 -07:00
parent 90bfddef2d
commit 0cae4399bd
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@@ -40857,7 +40857,12 @@ case "${host}" in
;; ;;
esac esac
dedup_flags () { printf %s "$@" | awk -v RS=' +' -v ORS=' ' '$0=="-arch" || $0=="-framework" || !seen[$0]++'; } dedup_flags()
{
printf "%s " "$@" |
awk 'BEGIN { RS=" "; ORS=" " }
{ if ($0=="-arch" || $0=="-framework" || !seen[$0]++) print }'
}
WX_CPPFLAGS=`dedup_flags "$CPPFLAGS"` WX_CPPFLAGS=`dedup_flags "$CPPFLAGS"`
WX_CFLAGS=`dedup_flags "$CFLAGS"` WX_CFLAGS=`dedup_flags "$CFLAGS"`

7
configure.in
View File

@@ -8448,7 +8448,12 @@ dnl Also get rid of duplicates in the flags, which results in dramatically
dnl shorter build logs and so is well worth it (but preserve some special dnl shorter build logs and so is well worth it (but preserve some special
dnl flags which are explicitly allowed to occur multiple times, as all their dnl flags which are explicitly allowed to occur multiple times, as all their
dnl occurrences must be preserved). dnl occurrences must be preserved).
dedup_flags () { printf %s "$@" | awk -v RS=' +' -v ORS=' ' '$0=="-arch" || $0=="-framework" || !seen[[$0]]++'; } dedup_flags()
{
printf "%s " "$@" |
awk 'BEGIN { RS=" "; ORS=" " }
{ if ($0=="-arch" || $0=="-framework" || !seen[[$0]]++) print }'
}
WX_CPPFLAGS=`dedup_flags "$CPPFLAGS"` WX_CPPFLAGS=`dedup_flags "$CPPFLAGS"`
WX_CFLAGS=`dedup_flags "$CFLAGS"` WX_CFLAGS=`dedup_flags "$CFLAGS"`