Skip to content
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

sccs: fix build with gcc14 #3749

Merged
merged 1 commit into from
Dec 5, 2024
Merged

sccs: fix build with gcc14 #3749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions build/sccs/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# http://www.illumos.org/license/CDDL.
# }}}

# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.

. ../../lib/build.sh

Expand All @@ -39,16 +39,23 @@ configure_arch() { :; }
MAKE="dmake"
MAKE_ARGS="CCOM=gcc32"
MAKE_ARGS_WS="
COPTX=\"$CTF_CFLAGS $SSPFLAGS\"
LDOPTX=\"$CTF_CFLAGS $SSPFLAGS\"
COPTX=\"$CTF_CFLAGS $SSPFLAGS -fpermissive\"
LDOPTX=\"$CTF_CFLAGS $SSPFLAGS -fpermissive\"
"
MAKE_INSTALL_ARGS="$MAKE_ARGS"

run_test() {
$EGREP -s '#[[:space:]]*define[[:space:]]*SIZEOF_INT[[:space:]]*4$' \
$TMPDIR/$BUILDDIR/include/schily/xmconfig.h \
|| logerr "Configure failed to detect type sizes"
}

init
prep_build
download_source $PROG $PROG $VER
patch_source
build
run_test
make_package
clean_up

Expand Down
20 changes: 9 additions & 11 deletions build/sccs/local.mog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.

# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.

license CDDL.Schily.txt license=CDDL
license GPL-2.0.txt license=GPLv2
Expand All @@ -20,21 +20,19 @@ license GPL-2.0.txt license=GPLv2
<transform dir path=usr/ccs$ -> set mode 0755>
<transform dir path=usr/ccs/bin$ -> set mode 0755>

# Drop diff binaries and man pages
<transform file path=usr/ccs/bin/b?diff$ -> drop>
<transform file path=usr/share/man/man1/b?diff.1$ -> drop>

# Drop patch man page
<transform file path=usr/share/man/man1/patch.1$ -> drop>

# Links to /usr/bin
<transform link path=usr/bin/sccs -> drop>
<transform file link hardlink path=usr/ccs/bin/(.*) -> emit \
<transform file link hardlink path=usr/ccs/bin/(?!sccs)(.*)$ -> emit \
link path=usr/bin/%<1> target=../ccs/bin/%<1> >

# We do not want such a generic command as 'help' in usr/bin, rename it
<transform link path=usr/bin/help -> edit path help sccshelp>
<transform file path=usr/share/man/man1/help.1 -> edit path help sccshelp>
<transform file path=usr/share/man/man1/help\.1 -> edit path help sccshelp>

# We don't want to replace the system diff binaries, drop
<transform link path=usr/bin/b?diff -> drop>

# Drop conflicting man pages
<transform file path=usr/share/man/man1/(b?diff|patch)\.1$ -> drop>

# Relocate section 4 manpages to section 5
<transform file path=usr/share/man/man4 -> edit path 4 5>
Expand Down
Loading