Bug#870445: libglvnd: FTBFS on non-Linux: u_execmem_free undefined
Followup-For: Bug #870445
Control: tag -1 patch
Hi,
attached are two patches to fix this FTBFS.
Build-tested on falla and exodar.
The git repository is missing the pristine-tar commit for 1.0.0 and all
the upstream version tags.
Andreas
>From 09a59c852e307c7e4d6770fa137975dab93ce9fe Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <anbe@debian.org>
Date: Sat, 25 Nov 2017 15:00:32 +0000
Subject: [PATCH 1/2] use source format 3.0 (quilt)
---
debian/changelog | 6 ++++++
debian/source/format | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 207a54a..ded1623 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libglvnd (1.0.0-2) UNRELEASED; urgency=medium
+
+ * Use source format 3.0 (quilt).
+
+ -- Andreas Beckmann <anbe@debian.org> Sat, 25 Nov 2017 14:59:46 +0000
+
libglvnd (1.0.0-1) unstable; urgency=high
[ Andreas Boll ]
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
2.1.4
>From b48012726befb68920af1cbe4fc3beb0bc6afab2 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <anbe@debian.org>
Date: Sat, 25 Nov 2017 15:10:20 +0000
Subject: [PATCH 2/2] fix FTBFS on kFreeBSD and Hurd
---
debian/changelog | 2 ++
debian/patches/kfreebsd-hurd.patch | 14 ++++++++++++++
debian/patches/series | 1 +
3 files changed, 17 insertions(+)
create mode 100644 debian/patches/kfreebsd-hurd.patch
create mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index ded1623..76f7e56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
libglvnd (1.0.0-2) UNRELEASED; urgency=medium
* Use source format 3.0 (quilt).
+ * kfreebsd-hurd.patch: New, fix FTBFS on kFreeBSD and Hurd.
+ (Closes: #870445)
-- Andreas Beckmann <anbe@debian.org> Sat, 25 Nov 2017 14:59:46 +0000
diff --git a/debian/patches/kfreebsd-hurd.patch b/debian/patches/kfreebsd-hurd.patch
new file mode 100644
index 0000000..c504e51
--- /dev/null
+++ b/debian/patches/kfreebsd-hurd.patch
@@ -0,0 +1,14 @@
+Author: Andreas Beckmann <anbe@debian.org>
+Description: fix FTBFS on kFreeBSD and Hurd
+
+--- a/src/GLdispatch/vnd-glapi/u_execmem.c
++++ b/src/GLdispatch/vnd-glapi/u_execmem.c
+@@ -68,7 +68,7 @@ static unsigned char *exec_mem = NULL;
+ static unsigned char *write_mem = NULL;
+
+
+-#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun) || defined(__HAIKU__)
++#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun) || defined(__HAIKU__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
+
+ #include <unistd.h>
+ #include <sys/mman.h>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1dfcb87
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kfreebsd-hurd.patch
--
2.1.4
Reply to: