justbuild: update to 1.2.1.

This commit is contained in:
Leah Neukirchen 2023-08-30 16:43:29 +02:00
parent caf24fc39a
commit 5d63453265
2 changed files with 49 additions and 3 deletions

View File

@ -0,0 +1,45 @@
From 1b068c12b31b4a484bf49964b3057e6466b8953a Mon Sep 17 00:00:00 2001
From: "Klaus T. Aehlig" <aehlig@linta.de>
Date: Sun, 27 Aug 2023 16:35:52 +0200
Subject: [PATCH] absl: avoid off64_t
... to improve portability
---
etc/import/absl/base/TARGETS.absl | 5 +++++
etc/patches/direct_mmap.h.diff | 11 +++++++++++
2 files changed, 16 insertions(+)
create mode 100644 etc/patches/direct_mmap.h.diff
diff --git a/etc/import/absl/base/TARGETS.absl b/etc/import/absl/base/TARGETS.absl
index 7383de5..168c1eb 100644
--- a/etc/import/absl/base/TARGETS.absl
+++ b/etc/import/absl/base/TARGETS.absl
@@ -366,6 +366,11 @@
, "raw_logging_internal"
]
}
+, "internal/direct_mmap.h":
+ { "type": ["@", "rules", "patch", "file"]
+ , "src": [["FILE", null, "internal/direct_mmap.h"]]
+ , "patch": [["@", "patches", "", "direct_mmap.h.diff"]]
+ }
, "prefetch":
{ "type": ["@", "rules", "CC", "library"]
, "name": ["prefetch"]
diff --git a/etc/patches/direct_mmap.h.diff b/etc/patches/direct_mmap.h.diff
new file mode 100644
index 0000000..8c400e2
--- /dev/null
+++ b/etc/patches/direct_mmap.h.diff
@@ -0,0 +1,11 @@
+--- direct_mmap.h.orig 2023-08-27 16:22:17.101255129 +0200
++++ direct_mmap.h 2023-08-27 16:23:26.048355108 +0200
+@@ -72,7 +72,7 @@
+ // Platform specific logic extracted from
+ // https://chromium.googlesource.com/linux-syscall-support/+/master/linux_syscall_support.h
+ inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd,
+- off64_t offset) noexcept {
++ int64_t offset) noexcept {
+ #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \
+ defined(__m68k__) || defined(__sh__) || \
+ (defined(__hppa__) && !defined(__LP64__)) || \

View File

@ -1,7 +1,7 @@
# Template file for 'justbuild'
pkgname=justbuild
version=1.1.4
revision=3
version=1.2.1
revision=1
create_wrksrc=yes
hostmakedepends="jo pandoc pkg-config python3 tar unzip wget"
makedepends="abseil-cpp-devel c-ares-devel catch2 fmt-devel grpc-devel json-c++
@ -13,7 +13,7 @@ license="Apache-2.0"
homepage="https://github.com/just-buildsystem/justbuild/"
changelog="https://github.com/just-buildsystem/justbuild/blob/master/CHANGELOG.md"
distfiles="https://github.com/just-buildsystem/justbuild/archive/v${version}.tar.gz"
checksum=850b570ae6da047a5227dca9029225ef7d7d988522924e445e90ae62bf2ca6ae
checksum=0fe771914265d3edae0ee17daf2be48ed602e33a0cd1b0d04d822c0b8cb488a4
conflicts="just>=0"
nocross="not supported by bootstrapping"
@ -39,6 +39,7 @@ do_build() {
bazel_remote_apis \
cli11 \
com_github_microsoft_gsl \
com_google_absl \
google_apis \
protobuf
)