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.

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

package updates #1366

Merged
merged 22 commits into from
Nov 30, 2023
Merged
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
2 changes: 1 addition & 1 deletion build/cargo-c/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=cargo-c
VER=0.9.27
VER=0.9.28
PKG=ooce/developer/cargo-c
SUMMARY="build and install C-ABI compatible dynamic and static libraries"
DESC="produces and installs a correct pkg-config file, a static library and "
Expand Down
2 changes: 1 addition & 1 deletion build/clamav/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=clamav
VER=1.2.0
VER=1.2.1
PKG=ooce/system/clamav
SUMMARY="Clam Anti-virus"
DESC="$PROG is an open-source antivirus engine for detecting trojans, "
Expand Down
2 changes: 1 addition & 1 deletion build/clang/build-17.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

PROG=clang
PKG=ooce/developer/clang-17
VER=17.0.4
VER=17.0.6
SUMMARY="C language family frontend for LLVM"
DESC="The Clang project provides a language front-end and tooling "
DESC+="infrastructure for languages in the C language family (C, C++, "
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/lib/Basic/Targets/OSTargets.h a/lib/Basic/Targets/OSTargets.h
--- a~/lib/Basic/Targets/OSTargets.h 1970-01-01 00:00:00
+++ a/lib/Basic/Targets/OSTargets.h 1970-01-01 00:00:00
@@ -625,6 +625,7 @@ protected:
@@ -639,6 +639,7 @@ protected:
void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
MacroBuilder &Builder) const override {
DefineStd(Builder, "sun", Opts);
Expand Down
13 changes: 7 additions & 6 deletions build/clang/patches-17/add-rpath-for-libstdcxx.patch
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/lib/Driver/ToolChain.cpp a/li
diff -wpruN --no-dereference '--exclude=*.orig' a~/lib/Driver/ToolChains/Solaris.cpp a/lib/Driver/ToolChains/Solaris.cpp
--- a~/lib/Driver/ToolChains/Solaris.cpp 1970-01-01 00:00:00
+++ a/lib/Driver/ToolChains/Solaris.cpp 1970-01-01 00:00:00
@@ -128,10 +128,11 @@ void solaris::Linker::ConstructJob(Compi
@@ -151,11 +151,12 @@ void solaris::Linker::ConstructJob(Compi
bool NeedsSanitizerDeps = addSanitizerRuntimes(getToolChain(), Args, CmdArgs);
AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs, JA);

Expand All @@ -24,12 +24,13 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/lib/Driver/ToolChains/Solaris
+
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs,
options::OPT_r)) {
- if (getToolChain().ShouldLinkCXXStdlib(Args))
- getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
if (D.CCCIsCXX()) {
- if (getToolChain().ShouldLinkCXXStdlib(Args))
- getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
CmdArgs.push_back("-lm");
}
// LLVM support for atomics on 32-bit SPARC V8+ is incomplete, so
// forcibly link with libatomic as a workaround.
if (getToolChain().getTriple().getArch() == llvm::Triple::sparc) {
@@ -305,3 +306,16 @@ void Solaris::addLibStdCxxIncludePaths(
@@ -334,3 +335,16 @@ void Solaris::addLibStdCxxIncludePaths(
TripleStr, Multilib.includeSuffix(), DriverArgs,
CC1Args);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Sync SunOS default defines with a working reality.
diff -wpruN --no-dereference '--exclude=*.orig' a~/lib/Basic/Targets/OSTargets.h a/lib/Basic/Targets/OSTargets.h
--- a~/lib/Basic/Targets/OSTargets.h 1970-01-01 00:00:00
+++ a/lib/Basic/Targets/OSTargets.h 1970-01-01 00:00:00
@@ -628,22 +628,15 @@ protected:
@@ -642,22 +642,15 @@ protected:
DefineStd(Builder, "unix", Opts);
Builder.defineMacro("__svr4__");
Builder.defineMacro("__SVR4");
Expand Down
10 changes: 1 addition & 9 deletions build/clang/patches-17/no-default-libgcc_s-linking.patch
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/lib/Driver/ToolChains/Solaris.cpp a/lib/Driver/ToolChains/Solaris.cpp
--- a~/lib/Driver/ToolChains/Solaris.cpp 1970-01-01 00:00:00
+++ a/lib/Driver/ToolChains/Solaris.cpp 1970-01-01 00:00:00
@@ -53,6 +53,7 @@ void solaris::Linker::ConstructJob(Compi
const ArgList &Args,
const char *LinkingOutput) const {
ArgStringList CmdArgs;
+ const Driver &D = getToolChain().getDriver();

// Demangle C++ names in errors
CmdArgs.push_back("-C");
@@ -138,7 +139,8 @@ void solaris::Linker::ConstructJob(Compi
@@ -165,6 +165,7 @@ void solaris::Linker::ConstructJob(Compi
CmdArgs.push_back("-latomic");
CmdArgs.push_back(getAsNeededOption(getToolChain(), false));
}
Expand Down
12 changes: 0 additions & 12 deletions build/clang/patches-17/no-default-libm-linking.patch

This file was deleted.

8 changes: 4 additions & 4 deletions build/clang/patches-17/no-ssp-linking.patch
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/lib/Driver/ToolChains/Solaris.cpp a/lib/Driver/ToolChains/Solaris.cpp
--- a~/lib/Driver/ToolChains/Solaris.cpp 1970-01-01 00:00:00
+++ a/lib/Driver/ToolChains/Solaris.cpp 1970-01-01 00:00:00
@@ -131,13 +131,6 @@ void solaris::Linker::ConstructJob(Compi
options::OPT_r)) {
if (getToolChain().ShouldLinkCXXStdlib(Args))
getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
@@ -158,13 +158,6 @@ void solaris::Linker::ConstructJob(Compi
getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
CmdArgs.push_back("-lm");
}
- if (Args.hasArg(options::OPT_fstack_protector) ||
- Args.hasArg(options::OPT_fstack_protector_strong) ||
- Args.hasArg(options::OPT_fstack_protector_all)) {
Expand Down
2 changes: 1 addition & 1 deletion build/clang/patches-17/no-usr-local-include.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/lib/Driver/ToolChains/Solaris.cpp a/lib/Driver/ToolChains/Solaris.cpp
--- a~/lib/Driver/ToolChains/Solaris.cpp 1970-01-01 00:00:00
+++ a/lib/Driver/ToolChains/Solaris.cpp 1970-01-01 00:00:00
@@ -246,9 +246,6 @@ void Solaris::AddClangSystemIncludeArgs(
@@ -276,9 +276,6 @@ void Solaris::AddClangSystemIncludeArgs(
if (DriverArgs.hasArg(clang::driver::options::OPT_nostdinc))
return;

Expand Down
1 change: 0 additions & 1 deletion build/clang/patches-17/series
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ add-rpath-for-libstdcxx.patch
no-version-script.patch
no-symbolic-functions.patch
no-sanitizer-runtime-lib-linking.patch
no-default-libm-linking.patch
add-__illumos__-preprocessor-definition.patch
2 changes: 1 addition & 1 deletion build/cmake/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=cmake
VER=3.27.7
VER=3.27.9
PKG=ooce/developer/cmake
SUMMARY="Build coordinator"
DESC="An extensible system that manages the build process in a "
Expand Down
2 changes: 1 addition & 1 deletion build/ffmpeg/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=ffmpeg
VER=6.0
VER=6.1
PKG=ooce/multimedia/ffmpeg
SUMMARY="ffmpeg"
DESC="A complete, cross-platform solution to record, "
Expand Down
2 changes: 1 addition & 1 deletion build/ffmpeg/patches-4.4/clang-no-mimpure-text.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
diff -wpruN '--exclude=*.orig' a~/configure a/configure
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure a/configure
--- a~/configure 1970-01-01 00:00:00
+++ a/configure 1970-01-01 00:00:00
@@ -5351,7 +5351,7 @@ case $target_os in
Expand Down
2 changes: 1 addition & 1 deletion build/ffmpeg/patches-5.1/clang-no-mimpure-text.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
diff -wpruN '--exclude=*.orig' a~/configure a/configure
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure a/configure
--- a~/configure 1970-01-01 00:00:00
+++ a/configure 1970-01-01 00:00:00
@@ -5477,7 +5477,7 @@ case $target_os in
Expand Down
4 changes: 2 additions & 2 deletions build/ffmpeg/patches/clang-no-mimpure-text.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -wpruN '--exclude=*.orig' a~/configure a/configure
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure a/configure
--- a~/configure 1970-01-01 00:00:00
+++ a/configure 1970-01-01 00:00:00
@@ -5477,7 +5477,7 @@ case $target_os in
@@ -5567,7 +5567,7 @@ case $target_os in
;;
sunos)
SHFLAGS='-shared -Wl,-h,$$(@F)'
Expand Down
4 changes: 2 additions & 2 deletions build/gh/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@

PROG=gh
PKG=ooce/util/gh
VER=2.36.0
VER=2.39.2
SUMMARY="github-cli"
DESC="The GitHub CLI tool"

set_arch 64
set_gover
set_gover 1.21

RUN_DEPENDS_IPS="developer/versioning/git"

Expand Down
2 changes: 1 addition & 1 deletion build/go/build-120.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

PROG=go
PKG=ooce/developer/go-120
VER=1.20.10
VER=1.20.11
SUMMARY="The Go Programming Language"
DESC="An open source programming language that makes it easy to build simple, "
DESC+="reliable, and efficient software."
Expand Down
2 changes: 1 addition & 1 deletion build/go/build-121.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

PROG=go
PKG=ooce/developer/go-121
VER=1.21.3
VER=1.21.4
SUMMARY="The Go Programming Language"
DESC="An open source programming language that makes it easy to build simple, "
DESC+="reliable, and efficient software."
Expand Down
2 changes: 1 addition & 1 deletion build/isc-bind9/build-916.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
. ../../lib/build.sh

PROG=bind
VER=9.16.44
VER=9.16.45
PKG=ooce/network/bind-916
SUMMARY="ISC BIND DNS Server & Tools"
DESC="Server & Client Utilities for DNS"
Expand Down
2 changes: 1 addition & 1 deletion build/isc-bind9/build-918.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
. ../../lib/build.sh

PROG=bind
VER=9.18.19
VER=9.18.20
PKG=ooce/network/bind-918
SUMMARY="ISC BIND DNS Server & Tools"
DESC="Server & Client Utilities for DNS"
Expand Down
2 changes: 1 addition & 1 deletion build/isc-bind9/patches-918/linker_flags.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
--- a~/configure.ac 1970-01-01 00:00:00
+++ a/configure.ac 1970-01-01 00:00:00
@@ -277,17 +277,6 @@ AM_CONDITIONAL([HAVE_PYMOD_DNS], [test "
@@ -254,17 +254,6 @@ AM_CONDITIONAL([HAVE_PYTEST], [test -n "
#
AC_PATH_PROG([XSLTPROC], [xsltproc])

Expand Down
2 changes: 1 addition & 1 deletion build/libde265/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=libde265
VER=1.0.12
VER=1.0.14
PKG=ooce/library/libde265
SUMMARY="h.265 codec implementation"
DESC="Open source implementation of the h.265 video codec"
Expand Down
2 changes: 1 addition & 1 deletion build/libheif/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=libheif
VER=1.17.1
VER=1.17.5
PKG=ooce/library/libheif
SUMMARY="HEIF and AVIF encoder"
DESC="ISO/IEC 23008-12:2017 HEIF and AVIF (AV1 Image File Format) "
Expand Down
2 changes: 1 addition & 1 deletion build/libuv/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=libuv
VER=1.46.0
VER=1.47.0
PKG=ooce/library/libuv
SUMMARY=$PROG
DESC="Multi-platform support library with a focus on asynchronous I/O."
Expand Down
5 changes: 5 additions & 0 deletions build/libuv/testsuite.log
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ ok - embed
ok - emfile
ok - env_vars
ok - error_message
ok - fork_close_signal_in_child
ok - fork_fs_events_child
ok - fork_fs_events_child_dir
ok - fork_fs_events_file_parent_child
Expand Down Expand Up @@ -77,6 +78,7 @@ ok - fs_fstat
ok - fs_fstat_stdio
ok - fs_futime
ok - fs_get_system_error
ok - fs_link
ok - fs_lutime
ok - fs_mkdtemp
ok - fs_mkstemp
Expand Down Expand Up @@ -257,6 +259,7 @@ ok - spawn_preserve_env
ok - spawn_quoted_path # SKIP Test for Windows
ok - spawn_reads_child_path
ok - spawn_relative_path
ok - spawn_same_stdout_stderr
ok - spawn_setgid_fails
ok - spawn_setuid_fails
ok - spawn_setuid_setgid # SKIP It should be run as root user
Expand Down Expand Up @@ -301,6 +304,8 @@ ok - tcp_close_reset_accepted_after_socket_shutdown
ok - tcp_close_reset_client
ok - tcp_close_reset_client_after_shutdown
ok - tcp_close_while_connecting
ok - tcp_connect6_error_fault
ok - tcp_connect6_link_local
ok - tcp_connect_error_after_write
ok - tcp_connect_error_fault
ok - tcp_connect_timeout
Expand Down
2 changes: 1 addition & 1 deletion build/llvm/build-17.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

PROG=llvm
PKG=ooce/developer/llvm-17
VER=17.0.4
VER=17.0.6
SUMMARY="Low Level Virtual Machine compiler infrastructure"
DESC="A collection of modular and reusable compiler and toolchain technologies"

Expand Down
12 changes: 7 additions & 5 deletions build/llvm/patches-17/tools_llvm-shlib_CMakeLists.txt.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,18 @@ Use the Linux style linking everywhere except Darwin and SunOS.
diff -wpruN --no-dereference '--exclude=*.orig' a~/tools/llvm-shlib/CMakeLists.txt a/tools/llvm-shlib/CMakeLists.txt
--- a~/tools/llvm-shlib/CMakeLists.txt 1970-01-01 00:00:00
+++ a/tools/llvm-shlib/CMakeLists.txt 1970-01-01 00:00:00
@@ -33,14 +33,11 @@ if(LLVM_BUILD_LLVM_DYLIB)
@@ -33,16 +33,11 @@ if(LLVM_BUILD_LLVM_DYLIB)
add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES})

list(REMOVE_DUPLICATES LIB_NAMES)
- if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)
- OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
- if((MINGW) OR (HAIKU)
- OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
- OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "GNU")
- OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
- OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "NetBSD")
- OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD")
- OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia")
- OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")
- OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia")
- OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Android")
- OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")) # FIXME: It should be "GNU ld for elf"
+ if("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")
Expand All @@ -25,7 +27,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/tools/llvm-shlib/CMakeLists.t
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/simple_version_script.map.in
${LLVM_LIBRARY_DIR}/tools/llvm-shlib/simple_version_script.map)
@@ -58,8 +55,6 @@ if(LLVM_BUILD_LLVM_DYLIB)
@@ -60,8 +55,6 @@ if(LLVM_BUILD_LLVM_DYLIB)
# inside and outside libLLVM.so.
target_link_options(LLVM PRIVATE LINKER:-Bsymbolic-functions)
endif()
Expand Down
2 changes: 1 addition & 1 deletion build/mariadb/build-1011.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=mariadb
VER=10.11.5
VER=10.11.6
PKG=ooce/database/mariadb-1011
SUMMARY="MariaDB"
DESC="A community-developed, commercially supported fork of the "
Expand Down
2 changes: 1 addition & 1 deletion build/mariadb/build-104.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=mariadb
VER=10.4.31
VER=10.4.32
PKG=ooce/database/mariadb-104
SUMMARY="MariaDB"
DESC="A community-developed, commercially supported fork of the "
Expand Down
2 changes: 1 addition & 1 deletion build/mariadb/build-105.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=mariadb
VER=10.5.22
VER=10.5.23
PKG=ooce/database/mariadb-105
SUMMARY="MariaDB"
DESC="A community-developed, commercially supported fork of the "
Expand Down
2 changes: 1 addition & 1 deletion build/mariadb/build-106.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
. ../../lib/build.sh

PROG=mariadb
VER=10.6.15
VER=10.6.16
PKG=ooce/database/mariadb-106
SUMMARY="MariaDB"
DESC="A community-developed, commercially supported fork of the "
Expand Down
2 changes: 1 addition & 1 deletion build/meta/extra-build-tools.p5m
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ depend fmri=driver/tuntap type=require
depend fmri=library/unixodbc type=require
depend fmri=ooce/application/graphviz type=require
depend fmri=ooce/application/imagemagick type=require
depend fmri=ooce/application/php-80 type=require
depend fmri=ooce/application/php-81 type=require
depend fmri=ooce/application/php-82 type=require
depend fmri=ooce/application/php-83 type=require
depend fmri=ooce/audio/flac type=require
depend fmri=ooce/database/bdb type=require
depend fmri=ooce/database/lmdb type=require
Expand Down
2 changes: 1 addition & 1 deletion build/nginx/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

PROG=nginx
PKG=ooce/server/nginx
VER=1.25.2
VER=1.25.3
SUMMARY="nginx web server"
DESC="nginx is a high-performance HTTP(S) server and reverse proxy"

Expand Down
Loading
Loading