Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ee3018f331683ab18e465e64fa73448d5d5ca318)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ee3018f331683ab18e465e64fa73448d5d5ca318)
  • Date: Mon, 17 Jul 2023 00:17:25 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

libs/abseil-cpp/HISTORY | 4 +
libs/abseil-cpp/PRE_BUILD | 3 +
libs/abseil-cpp/patches/0001-Fix-build-against-musl-libc.patch | 28
++++++++++
libs/protobuf/DEPENDS | 11 ++-
libs/protobuf/DETAILS | 4 -
libs/protobuf/HISTORY | 2
6 files changed, 45 insertions(+), 7 deletions(-)

New commits:
commit ee3018f331683ab18e465e64fa73448d5d5ca318
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

abseil-cpp: Fix build against musl

commit 7e00683f5448824274b099973833b90034724d5d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

protobuf 23.4

commit 4114e90dcfcce7dec73026501c5cc700d026e464
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

protobuf: add version requirement for abseil-cpp

diff --git a/libs/abseil-cpp/HISTORY b/libs/abseil-cpp/HISTORY
index 1468979..b305c66 100644
--- a/libs/abseil-cpp/HISTORY
+++ b/libs/abseil-cpp/HISTORY
@@ -1,3 +1,7 @@
+2023-07-16 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, patches/0001-Fix-build-against-musl-libc.patch:
+ fixed build against musl
+
2023-05-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 20230125.3

diff --git a/libs/abseil-cpp/PRE_BUILD b/libs/abseil-cpp/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/libs/abseil-cpp/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/libs/abseil-cpp/patches/0001-Fix-build-against-musl-libc.patch
b/libs/abseil-cpp/patches/0001-Fix-build-against-musl-libc.patch
new file mode 100644
index 0000000..461c891
--- /dev/null
+++ b/libs/abseil-cpp/patches/0001-Fix-build-against-musl-libc.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT sourcemage.org>
+Date: Sun, 16 Jul 2023 21:54:21 +0200
+Subject: [PATCH] Fix build against musl libc
+
+The build fails because of missing off64_t definition; in order
+for musl to expose off64_t, the source file must define the
+_LARGEFILE64_SOURCE macro.
+
+Origin: Source Mage
+Upstream-Status: Pending
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ absl/base/internal/direct_mmap.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/direct_mmap.h b/direct_mmap.h
+index 815b8d23ba35..d34bd74c7a92 100644
+--- a/absl/base/internal/direct_mmap.h
++++ b/absl/base/internal/direct_mmap.h
+@@ -33,6 +33,7 @@
+ #include <syscall.h>
+ #endif
+
++#define _LARGEFILE64_SOURCE /* for off64_t */
+ #include <linux/unistd.h>
+ #include <unistd.h>
+ #include <cerrno>
diff --git a/libs/protobuf/DEPENDS b/libs/protobuf/DEPENDS
index dd72611..27fa46e 100755
--- a/libs/protobuf/DEPENDS
+++ b/libs/protobuf/DEPENDS
@@ -1,5 +1,6 @@
-source $GRIMOIRE/CMAKE_DEPENDS &&
-
-depends -sub CXX gcc &&
-
-depends abseil-cpp
+. "$GRIMOIRE"/CMAKE_DEPENDS &&
+. "$GRIMOIRE"/VDEPENDS &&
+vdepends <<-!
+ abseil-cpp >= 20230125.3
+ gcc[CXX]
+!
diff --git a/libs/protobuf/DETAILS b/libs/protobuf/DETAILS
index e08e7f0..b21231d 100755
--- a/libs/protobuf/DETAILS
+++ b/libs/protobuf/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=protobuf
- VERSION=23.2
-
SOURCE_HASH=sha512:2bff54f80bcf5eac015d6eca5a57a96ced4dbc3f5c05ab1095b95c73fb44b06f98f74f1b235ecea5ed7ee45a8702fff9771c83d6e8a2bdfe012a84f0a93d2b26
+ VERSION=23.4
+
SOURCE_HASH=sha512:b93a4e0339ecbe085796de5b6c61feae35229d40db9019c043090bcaa483a1cce78a99487c5638482c68832fcede5579a0e5ec731221a88359b80db9bb6dc566
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://protobuf.dev/
diff --git a/libs/protobuf/HISTORY b/libs/protobuf/HISTORY
index 99743a5..4c6578f 100644
--- a/libs/protobuf/HISTORY
+++ b/libs/protobuf/HISTORY
@@ -1,5 +1,7 @@
2023-07-16 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: added version requirement for abseil-cpp
* DETAILS: fixed WEB_SITE
+ updated spell to 23.4

2023-05-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 23.2



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ee3018f331683ab18e465e64fa73448d5d5ca318), Ismael Luceno, 07/16/2023

Archive powered by MHonArc 2.6.24.

Top of Page