SerenityOS/serenity
1
0 Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2026-11-07 04:29:30 -10:00
Code Issues Packages Projects Releases Wiki Activity

Ports: Update abseil to 20260817.0

Browse Source
This commit is contained in:
Linus Groh authored and Nico Weber committed 2026-09-19 20:32:06 -04:00
1 parent 4d7c368416
commit 901c4f0dde
7 files changed
+30 -62
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Ports/AvailablePorts.md
+1 -1
View File
@@ -6,7 +6,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
| Port | Name | Version | Website |
| ----------------------------------------------- | ------------------------------------------------------------- | ---------------------- | -------------------------------------------------------------------- |
| [`abseil`](abseil/) | Abseil Common Libraries | 20230802.0 | https://abseil.io/ |
| [`abseil`](abseil/) | Abseil Common Libraries | 20260817.0 | https://abseil.io/ |
| [`aclock`](aclock/) | aclock | 2.3 | https://github.com/tenox7/aclock |
| [`acpica-tools`](acpica-tools/) | ACPI Component Architecture Project Userspace Utilities | R06_28_23 | https://github.com/acpica/acpica |
| [`alpine`](alpine/) | Alpine Email Client | 2.26 | https://alpineapp.email |
Ports/abseil/package.sh
+3 -2
View File
@@ -1,7 +1,8 @@
#!/usr/bin/env -S bash ../.port_include.sh
port='abseil'
useconfigure='true'
version='20230802.0'
version='20260817.0'
workdir="abseil-cpp-${version}"
configopts=(
"-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
'-DABSL_PROPAGATE_CXX_STD=ON'
@@ -9,7 +10,7 @@ configopts=(
'-DABSL_BUILD_TESTING=OFF'
)
files=(
"git+https://github.com/abseil/abseil-cpp.git#${version}"
"https://github.com/abseil/abseil-cpp/releases/download/${version}/abseil-cpp-${version}.tar.gz#f7e05179df39c45434cad433f5783840bb3788ef322976f9138bc6b72b3a107d"
)
configure() {
Ports/abseil/patches/0001-Remove-strptime-support-on-Serenity.patch
+5 -5
View File
@@ -8,15 +8,15 @@ Subject: [PATCH] Remove strptime support on Serenity
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/absl/time/internal/cctz/src/time_zone_format.cc b/absl/time/internal/cctz/src/time_zone_format.cc
index 9b91f61cf09530fb3fc08c2a4091f61f86904a5e..d40858bc44c295a27efe4f9aa7da5241e5ba0381 100644
index f97de2f959270866650d3e503618b64fd7f1e415..c2296de8abf4ae71091366074c5a0008ba2ab4f6 100644
--- a/absl/time/internal/cctz/src/time_zone_format.cc
+++ b/absl/time/internal/cctz/src/time_zone_format.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#if !defined(HAS_STRPTIME)
-#if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__VXWORKS__)
+#if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__VXWORKS__) && !defined(__serenity__)
-#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__VXWORKS__)
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__VXWORKS__) || defined(__serenity__)
#define HAS_STRPTIME 0
#else
#define HAS_STRPTIME 1 // Assume everyone else has strptime().
#endif
#endif
Ports/abseil/patches/0002-Remove-LibC-timezone-support-on-Serenity.patch
+1 -1
View File
@@ -8,7 +8,7 @@ Subject: [PATCH] Remove LibC timezone support on Serenity
1 file changed, 10 insertions(+)
diff --git a/absl/time/internal/cctz/src/time_zone_libc.cc b/absl/time/internal/cctz/src/time_zone_libc.cc
index d01461222e9e60461384733162d1e042aa51147b..8ac1db60e61610bfbc2adc9c2f4658affd65712b 100644
index 362da1ab58be4f534d30a92b8fd62a49ca2ac2db..c879ad61a9714aa7a8862723f1bf233f3333f037 100644
--- a/absl/time/internal/cctz/src/time_zone_libc.cc
+++ b/absl/time/internal/cctz/src/time_zone_libc.cc
@@ -91,6 +91,11 @@ auto tm_gmtoff(const std::tm& tm) -> decltype(tm.tm_gmtoff) {
Ports/abseil/patches/0003-Only-check-error-codes-on-platforms-where-they-exist.patch
+4 -37
View File
@@ -4,47 +4,14 @@ Date: Sat, 16 Sep 2023 11:09:57 +0200
Subject: [PATCH] Only check error codes on platforms where they exist
---
absl/status/status.cc | 10 ++++++++++
1 file changed, 10 insertions(+)
absl/status/status.cc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/absl/status/status.cc b/absl/status/status.cc
index 26e68294acf7dca9f112987972dc48016c381f4f..68277d5967b23b52f790f7f1f3f6a27f640924eb 100644
index 155c5d8676f1f07e87fe3df461950b6d61334dee..33985500ac04148ee1cbec8ea873b3a091dedda0 100644
--- a/absl/status/status.cc
+++ b/absl/status/status.cc
@@ -464,14 +464,18 @@ StatusCode ErrnoToStatusCode(int error_number) {
case EFAULT: // Bad address
case EILSEQ: // Illegal byte sequence
case ENOPROTOOPT: // Protocol not available
+#ifdef ENOSTR
case ENOSTR: // Not a STREAM
+#endif
case ENOTSOCK: // Not a socket
case ENOTTY: // Inappropriate I/O control operation
case EPROTOTYPE: // Protocol wrong type for socket
case ESPIPE: // Invalid seek
return StatusCode::kInvalidArgument;
case ETIMEDOUT: // Connection timed out
+#ifdef ETIME
case ETIME: // Timer expired
+#endif
return StatusCode::kDeadlineExceeded;
case ENODEV: // No such device
case ENOENT: // No such file or directory
@@ -530,9 +534,13 @@ StatusCode ErrnoToStatusCode(int error_number) {
case EMLINK: // Too many links
case ENFILE: // Too many open files in system
case ENOBUFS: // No buffer space available
+#ifdef ENODATA
case ENODATA: // No message is available on the STREAM read queue
+#endif
case ENOMEM: // Not enough space
+#ifdef ENOSR
case ENOSR: // No STREAM resources
+#endif
#ifdef EUSERS
case EUSERS: // Too many users
#endif
@@ -575,7 +583,9 @@ StatusCode ErrnoToStatusCode(int error_number) {
@@ -381,7 +381,9 @@ StatusCode ErrnoToStatusCode(int error_number) {
case ENETRESET: // Connection aborted by network
case ENETUNREACH: // Network unreachable
case ENOLCK: // No locks available
Ports/abseil/patches/0004-Remove-elf_mem_image-support-on-Serenity.patch
+7 -7
View File
@@ -8,15 +8,15 @@ Subject: [PATCH] Remove elf_mem_image support on Serenity
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/absl/debugging/internal/elf_mem_image.h b/absl/debugging/internal/elf_mem_image.h
index e7fe6ab06e2ffdf78756f2fd3ebb2f9a78aa784c..565e8f6eb9b97c1dd7fc36b5a18c5f579fc40394 100644
index c8a103669ca3ee81c86a896b2a94de5ec2d20a1a..84d8da5e6bb35bb93b71e751eb46c8b5a9d75bfb 100644
--- a/absl/debugging/internal/elf_mem_image.h
+++ b/absl/debugging/internal/elf_mem_image.h
@@ -34,7 +34,7 @@
#if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \
!defined(__native_client__) && !defined(__asmjs__) && \
!defined(__wasm__) && !defined(__HAIKU__) && !defined(__sun) && \
- !defined(__VXWORKS__) && !defined(__hexagon__)
+ !defined(__VXWORKS__) && !defined(__hexagon__) && !defined(__serenity__)
@@ -35,7 +35,7 @@
#if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \
!defined(__asmjs__) && !defined(__wasm__) && !defined(__HAIKU__) && \
!defined(__sun) && !defined(__VXWORKS__) && !defined(__hexagon__) && \
- !defined(__XTENSA__)
+ !defined(__XTENSA__) && !defined(__serenity__)
#define ABSL_HAVE_ELF_MEM_IMAGE 1
#endif
Ports/abseil/patches/0005-Recognize-Serenity-as-having-mmap-pthread_getschedpa.patch
+9 -9
View File
@@ -9,19 +9,19 @@ Subject: [PATCH] Recognize Serenity as having mmap, pthread_getschedparam, and
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/absl/base/config.h b/absl/base/config.h
index 1de799300737100a4eb26e5f26fe8e75e6dcc010..8043049b7afa1f3423dc33a36ccc443b0dd49fbb 100644
index e37455634c7f9072f289082132e74aa4fec9a99c..be02598306dbfbdb1a3a902e586a7a98fd1f5a6e 100644
--- a/absl/base/config.h
+++ b/absl/base/config.h
@@ -412,7 +412,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
defined(__asmjs__) || defined(__wasm__) || defined(__Fuchsia__) || \
defined(__sun) || defined(__ASYLO__) || defined(__myriad2__) || \
defined(__HAIKU__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
- defined(__QNX__) || defined(__VXWORKS__) || defined(__hexagon__)
+ defined(__QNX__) || defined(__VXWORKS__) || defined(__hexagon__) || defined(__serenity__)
@@ -380,7 +380,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
defined(__myriad2__) || defined(__HAIKU__) || defined(__OpenBSD__) || \
defined(__NetBSD__) || defined(__QNX__) || defined(__VXWORKS__) || \
defined(__hexagon__) || defined(__XTENSA__) || \
- defined(_WASI_EMULATED_MMAN)
+ defined(_WASI_EMULATED_MMAN) || defined(__serenity__)
#define ABSL_HAVE_MMAP 1
#endif
@@ -424,7 +424,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
@@ -392,7 +392,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
#error ABSL_HAVE_PTHREAD_GETSCHEDPARAM cannot be directly set
#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \
defined(_AIX) || defined(__ros__) || defined(__OpenBSD__) || \
@@ -30,7 +30,7 @@ index 1de799300737100a4eb26e5f26fe8e75e6dcc010..8043049b7afa1f3423dc33a36ccc443b
#define ABSL_HAVE_PTHREAD_GETSCHEDPARAM 1
#endif
@@ -444,7 +444,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
@@ -412,7 +412,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
#ifdef ABSL_HAVE_SCHED_YIELD
#error ABSL_HAVE_SCHED_YIELD cannot be directly set
#elif defined(__linux__) || defined(__ros__) || defined(__native_client__) || \