Skip to Content.
Sympa Menu

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

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 (cc30df02ffe6ab9bc44367737fa67e356feffd01)
  • Date: Sat, 18 Nov 2023 19:50:08 +0000

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

libs/libbsd/DETAILS
| 1
libs/libbsd/HISTORY
| 4 +
libs/libbsd/PRE_BUILD
| 3

libs/libbsd/patches/0001-funopen-Replace-off64_t-with-off_t-in-funopen_seek-.patch
| 38 ++++++++++
4 files changed, 46 insertions(+)

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

libbsd: Add Watch line

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

libbsd: Fix build against musl

diff --git a/libs/libbsd/DETAILS b/libs/libbsd/DETAILS
index a492f37..9a43686 100755
--- a/libs/libbsd/DETAILS
+++ b/libs/libbsd/DETAILS
@@ -1,3 +1,4 @@
+# Watch: https://libbsd.freedesktop.org/releases/
SPELL=libbsd
VERSION=0.11.7
SOURCE="${SPELL}-${VERSION}.tar.xz"
diff --git a/libs/libbsd/HISTORY b/libs/libbsd/HISTORY
index c195315..d806d93 100644
--- a/libs/libbsd/HISTORY
+++ b/libs/libbsd/HISTORY
@@ -1,3 +1,7 @@
+2023-11-18 Ismael Luceno <ismael AT sourcemage.org>
+ *
patches/0001-funopen-Replace-off64_t-with-off_t-in-funopen_seek-.patch,
+ PRE_BUILD: fixed build against musl (broken by musl update?)
+
2022-11-02 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.11.7

diff --git a/libs/libbsd/PRE_BUILD b/libs/libbsd/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/libs/libbsd/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git
a/libs/libbsd/patches/0001-funopen-Replace-off64_t-with-off_t-in-funopen_seek-.patch

b/libs/libbsd/patches/0001-funopen-Replace-off64_t-with-off_t-in-funopen_seek-.patch
new file mode 100644
index 0000000..8ad7c2e
--- /dev/null
+++
b/libs/libbsd/patches/0001-funopen-Replace-off64_t-with-off_t-in-funopen_seek-.patch
@@ -0,0 +1,38 @@
+From ec88b7bbbc9ef262b22302419ae14fce5fc7b1d8 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem AT gmail.com>
+Date: Thu, 15 Dec 2022 09:02:22 -0800
+Subject: [PATCH] funopen: Replace off64_t with off_t in funopen_seek()
+
+AC_SYS_LARGEFILE in configure.ac is setting needed defines to make
+64bit off_t on relevant platforms.
+
+Fixes build on musl:
+
+| src/funopen.c:68:28: error: unknown type name 'off64_t'; did you mean
'off_t'?
+| funopen_seek(void *cookie, off64_t *offset, int whence)
+| ^~~~~~~
+| off_t
+
+Closes: !24
+Signed-off-by: Khem Raj <raj.khem AT gmail.com>
+Signed-off-by: Guillem Jover <guillem AT hadrons.org>
+---
+ src/funopen.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/funopen.c b/src/funopen.c
+index 01b63b3..0513e38 100644
+--- a/src/funopen.c
++++ b/src/funopen.c
+@@ -65,7 +65,7 @@ funopen_write(void *cookie, const char *buf, size_t size)
+ }
+
+ static int
+-funopen_seek(void *cookie, off64_t *offset, int whence)
++funopen_seek(void *cookie, off_t *offset, int whence)
+ {
+ struct funopen_cookie *cookiewrap = cookie;
+ off_t soff = *offset;
+--
+GitLab
+



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (cc30df02ffe6ab9bc44367737fa67e356feffd01), Ismael Luceno, 11/18/2023

Archive powered by MHonArc 2.6.24.

Top of Page