Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 44 additions & 0 deletions build/abseil/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
#!/usr/bin/bash
#
# {{{ CDDL HEADER
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
# }}}

# Copyright 2025 Oxide Computer Company

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

PROG=abseil
VER=20240116.3
PKG=ooce/library/abseil
SUMMARY="abseil"
DESC="Collection of c++ libraries from google"

set_builddir $PROG-cpp-$VER

CONFIGURE_OPTS="
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=$PREFIX
"

CONFIGURE_OPTS[i386]="-DCMAKE_INSTALL_LIBDIR=$PREFIX/${LIBDIRS[i386]}"
CONFIGURE_OPTS[amd64]="-DCMAKE_INSTALL_LIBDIR=$PREFIX/${LIBDIRS[amd64]}"

init
download_source abseil $PROG-cpp-$VER
patch_source
prep_build cmake
build -noctf # C++
make_package
clean_up

# Vim hints
# vim:ts=4:sw=4:et:fdm=marker
13 changes: 13 additions & 0 deletions build/abseil/local.mog
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.

# Copyright 2025 Oxide Computer Company

license LICENSE license=Apache2
51 changes: 51 additions & 0 deletions build/boost/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
#!/usr/bin/bash
#
# {{{ CDDL HEADER
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
# }}}

# Copyright 2025 Oxide Computer Company

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

PROG=boost
VER=1.87.0
PKG=ooce/library/boost
SUMMARY="boost"
DESC="Widely used collection of c++ libraries"

SKIP_LICENCES=bsl

OPREFIX=$PREFIX
PREFIX+="/$PROG"

VERNAME=${VER//./_}
set_arch 64
set_builddir boost_$VERNAME

build() {
pushd $TMPDIR/$BUILDDIR >/dev/null \
|| logerr "Cannot change to $TMPDIR/$BUILDDIR"
logcmd ./bootstrap.sh --prefix=$DESTDIR/$PREFIX || logerr "bootstrap failed"
logcmd ./b2 link=static runtime-link=static install || logerr "build failed"
popd >/dev/null
}

init
download_source boost boost_$VERNAME
patch_source
prep_build
build
make_package
clean_up

# Vim hints
# vim:ts=4:sw=4:et:fdm=marker
13 changes: 13 additions & 0 deletions build/boost/local.mog
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.

# Copyright 2025 Oxide Computer Company

license LICENSE_1_0.txt license=bsl
31 changes: 31 additions & 0 deletions build/boost/patches/illumos.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
This was fixed upstream in
https://github.com/boostorg/process/commit/bb375f50bd5b362b087aab326df158a

This patch can be removed once we have updated past that.

diff --git a/libs/process/src/ext/cwd.cpp b/libs/process/src/ext/cwd.cpp
index 6aee83de1..32042ce4e 100644
--- a/libs/process/src/ext/cwd.cpp
+++ b/libs/process/src/ext/cwd.cpp
@@ -124,7 +124,7 @@ filesystem::path cwd(boost::process::v2::pid_type pid, boost::system::error_code
filesystem::path("/proc") / std::to_string(pid) / "cwd", ec
);
#elif defined(__sun)
- return fileystem::canonical(
+ return filesystem::canonical(
filesystem::path("/proc") / std::to_string(pid) / "path/cwd", ec
);
#endif
diff --git a/libs/process/src/ext/exe.cpp b/libs/process/src/ext/exe.cpp
index 0f05f8ab0..0d0d95ada 100644
--- a/libs/process/src/ext/exe.cpp
+++ b/libs/process/src/ext/exe.cpp
@@ -138,7 +138,7 @@ filesystem::path exe(boost::process::v2::pid_type pid, boost::system::error_code
filesystem::path("/proc") / std::to_string(pid) / "exe", ec
);
#elif defined(__sun)
- return fileystem::canonical(
+ return filesystem::canonical(
filesystem::path("/proc") / std::to_string(pid) / "path/a.out", ec
);
#endif
1 change: 1 addition & 0 deletions build/boost/patches/series
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
illumos.patch
1 change: 1 addition & 0 deletions build/meta/extra-build-tools.p5m
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ depend fmri=ooce/developer/yasm type=require
depend fmri=ooce/developer/zig type=require
depend fmri=ooce/editor/emacs type=require
depend fmri=ooce/fonts/liberation type=require
depend fmri=ooce/library/abseil type=require
depend fmri=ooce/library/apr type=require
depend fmri=ooce/library/cairo type=require
depend fmri=ooce/library/fcgi2 type=require
Expand Down
7 changes: 6 additions & 1 deletion build/protobuf/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,14 @@ CONFIGURE_OPTS="
-DCMAKE_INSTALL_PREFIX=$PREFIX
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-Dprotobuf_BUILD_TESTS=OFF
-Dprotobuf_ABSL_PROVIDER=package
-DCMAKE_PREFIX_PATH=$PREFIX
"
CONFIGURE_OPTS[i386]="-DCMAKE_INSTALL_LIBDIR=$PREFIX/${LIBDIRS[i386]}"
CONFIGURE_OPTS[amd64]="-DCMAKE_INSTALL_LIBDIR=$PREFIX/${LIBDIRS[amd64]}"
CONFIGURE_OPTS[amd64]="
-DCMAKE_INSTALL_LIBDIR=$PREFIX/${LIBDIRS[amd64]}
-DCMAKE_LIBRARY_ARCHITECTURE=amd64
"

init
clone_github_source $PROG "$GITHUB/protocolbuffers/$PROG" v$VER
Expand Down
2 changes: 2 additions & 0 deletions doc/baseline
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,11 @@ extra.omnios ooce/file/acltool
extra.omnios ooce/file/lsof
extra.omnios ooce/file/tree
extra.omnios ooce/fonts/liberation
extra.omnios ooce/library/abseil
extra.omnios ooce/library/apr
extra.omnios ooce/library/apr-util
extra.omnios ooce/library/bdw-gc
extra.omnios ooce/library/boost
extra.omnios ooce/library/cairo
extra.omnios ooce/library/fcgi2
extra.omnios ooce/library/fontconfig
Expand Down
2 changes: 2 additions & 0 deletions doc/packages.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,11 @@
| ooce/file/lsof | 4.95.0 | https://github.com/lsof-org/lsof/releases | [omniosorg](https://github.com/omniosorg)
| ooce/file/tree | 2.1.1 | http://mama.indstate.edu/users/ice/tree/ | [omniosorg](https://github.com/omniosorg)
| ooce/fonts/liberation | 2.1.5 | https://github.com/liberationfonts/liberation-fonts/releases | [omniosorg](https://github.com/omniosorg)
| ooce/library/abseil | 20240116.3 | https://github.com/abseil/abseil-cpp/releases/ | [oxidecomputer](https://github.com/oxidecomputer)
| ooce/library/apr | 1.7.4 | https://downloads.apache.org/apr/ | [omniosorg](https://github.com/omniosorg)
| ooce/library/apr-util | 1.6.3 | https://downloads.apache.org/apr/ | [omniosorg](https://github.com/omniosorg)
| ooce/library/bdw-gc | 8.2.2 | https://www.hboehm.info/gc/gc_source/ | [omniosorg](https://github.com/omniosorg)
| ooce/library/boost | 1.87.0 | https://archives.boost.io/release | [oxidecomputer](https://github.com/oxidecomputer)
| ooce/library/cairo | 1.16.0 | https://cairographics.org/releases/ | [omniosorg](https://github.com/omniosorg)
| ooce/library/fcgi2 | 2.4.2 | https://github.com/FastCGI-Archives/fcgi2/releases | [omniosorg](https://github.com/omniosorg)
| ooce/library/fontconfig | 2.14.2 | https://www.freedesktop.org/software/fontconfig/release/ https://www.freedesktop.org/wiki/Software/fontconfig/ | [omniosorg](https://github.com/omniosorg)
Expand Down