Skip to Content.
Sympa Menu

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

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 (489accc04ee6fb5859b28cbd0dc8c8682e11346b)
  • Date: Tue, 21 May 2019 20:23:48 +0000

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

devel/mcpp/HISTORY | 3
devel/mcpp/PRE_BUILD | 3
display/fbterm/HISTORY | 3
display/fbterm/PRE_BUILD | 4 -
display/fbterm/fix-musl-compile.patch | 99
++++++++++++++++++++++++++++++
libs/libnl/HISTORY | 4 -
libs/libnl/PRE_BUILD | 3
libs/libnl/fix-musl-compile-problem.patch | 37 +++++++++++
video-libs/libdv/HISTORY | 3
video-libs/libdv/PRE_BUILD | 3
10 files changed, 159 insertions(+), 3 deletions(-)

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

libnl: Fix build against musl

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

mcpp: Fix build against musl

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

libdv: Fix build against musl

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

fbterm: Fix build against musl

diff --git a/devel/mcpp/HISTORY b/devel/mcpp/HISTORY
index 85bf3d7..9d1f843 100644
--- a/devel/mcpp/HISTORY
+++ b/devel/mcpp/HISTORY
@@ -1,2 +1,5 @@
+2019-05-21 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Fixed build against musl
+
2015-03-29 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, DETAILS: spell created
diff --git a/devel/mcpp/PRE_BUILD b/devel/mcpp/PRE_BUILD
new file mode 100755
index 0000000..ddbdb63
--- /dev/null
+++ b/devel/mcpp/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+sedit 's!maybe_os in$!& linux-musl*|\\!' config/config.sub
diff --git a/display/fbterm/HISTORY b/display/fbterm/HISTORY
index c233600..5359dd1 100644
--- a/display/fbterm/HISTORY
+++ b/display/fbterm/HISTORY
@@ -1,3 +1,6 @@
+2019-05-21 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, fix-musl-compile.patch: Fixed build against musl
+
2018-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: update WEB_SITE
* PRE_BUILD, 0001-fix-compilation-with-gcc-7.patch: fix build with
gcc 7
diff --git a/display/fbterm/PRE_BUILD b/display/fbterm/PRE_BUILD
index b434f3a..11fe7e6 100755
--- a/display/fbterm/PRE_BUILD
+++ b/display/fbterm/PRE_BUILD
@@ -1,5 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p1 < "$SPELL_DIRECTORY/0001-fix-compilation-with-gcc-7.patch"
-
+patch -fp1 -i "$SPELL_DIRECTORY/fix-musl-compile.patch" &&
+patch -fp1 -i "$SPELL_DIRECTORY/0001-fix-compilation-with-gcc-7.patch"
diff --git a/display/fbterm/fix-musl-compile.patch
b/display/fbterm/fix-musl-compile.patch
new file mode 100644
index 0000000..a79bc13
--- /dev/null
+++ b/display/fbterm/fix-musl-compile.patch
@@ -0,0 +1,99 @@
+From 1072d60c6c8f1f51feb740527a8a056bfead9318 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report AT gmx.net>
+Date: Thu, 8 Oct 2015 19:53:47 +0200
+Subject: [PATCH] fbio.cpp, improxy.cpp, fbterm.cpp: fix musl compile
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- add missing include, fixes:
+
+ fbio.cpp:33:8: error: ‘fd_set’ does not name a type
+ static fd_set fds;
+
+ improxy.cpp:439:3: error: ‘fd_set’ was not declared in this scope
+
+- add missing WAIT_ANY define, fixes:
+
+ fbterm.cpp: In member function ‘void FbTerm::processSignal(u32)’:
+ fbterm.cpp:212:22: error: ‘WAIT_ANY’ was not declared in this scope
+ s32 pid = waitpid(WAIT_ANY, 0, WNOHANG);
+
+Signed-off-by: Peter Seiderer <ps.report AT gmx.net>
+---
+ src/fbio.cpp | 1 +
+ src/fbterm.cpp | 4 ++++
+ src/improxy.cpp | 1 +
+ 3 files changed, 6 insertions(+)
+
+diff --git a/src/fbio.cpp b/src/fbio.cpp
+index e5afc44..88c632c 100644
+--- a/src/fbio.cpp
++++ b/src/fbio.cpp
+@@ -30,6 +30,7 @@
+ #define NR_EPOLL_FDS 10
+ s32 epollFd;
+ #else
++#include <sys/select.h>
+ static fd_set fds;
+ static u32 maxfd = 0;
+ #endif
+diff --git a/src/fbterm.cpp b/src/fbterm.cpp
+index 38d4014..60288e4 100644
+--- a/src/fbterm.cpp
++++ b/src/fbterm.cpp
+@@ -37,6 +37,10 @@
+ #include "input_key.h"
+ #include "mouse.h"
+
++#ifndef WAIT_ANY
++#define WAIT_ANY (-1)
++#endif
++
+ #ifdef HAVE_SIGNALFD
+ // <sys/signalfd.h> offered by some systems has bug with g++
+ #include "signalfd.h"
+diff --git a/src/improxy.cpp b/src/improxy.cpp
+index 3d03e66..4e046d2 100644
+--- a/src/improxy.cpp
++++ b/src/improxy.cpp
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <errno.h>
++#include <sys/select.h>
+ #include <sys/socket.h>
+ #include "improxy.h"
+ #include "immessage.h"
+--
+2.1.4
+
+From a34dba99aff2994269ee347da67feb7ede9b1a67 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report AT gmx.net>
+Date: Thu, 18 Feb 2016 22:32:38 +0100
+Subject: [PATCH] mouse.cpp: fix musl compile
+
+Add missing include, fixes:
+
+ mouse.cpp:58:37: error: 'memset' was not declared in this scope
+ mouse.cpp:60:64: error: 'strncpy' was not declared in this scope
+
+Signed-off-by: Peter Seiderer <ps.report AT gmx.net>
+---
+ src/mouse.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mouse.cpp b/src/mouse.cpp
+index 0435dd9..f173137 100644
+--- a/src/mouse.cpp
++++ b/src/mouse.cpp
+@@ -27,6 +27,7 @@ DEFINE_INSTANCE(Mouse)
+ #include <stddef.h>
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <gpm.h>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+--
+2.1.4
diff --git a/libs/libnl/HISTORY b/libs/libnl/HISTORY
index 64f822e..9dcd31c 100644
--- a/libs/libnl/HISTORY
+++ b/libs/libnl/HISTORY
@@ -1,3 +1,6 @@
+2019-05-21 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, fix-musl-compile-problem.patch: Fixed build against musl
+
2017-10-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.4.0
* DETAILS: add gpg checking
@@ -63,4 +66,3 @@

2006-04-24 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS,INSTALL,libnl-1.pc: Created
-
diff --git a/libs/libnl/PRE_BUILD b/libs/libnl/PRE_BUILD
new file mode 100755
index 0000000..9d475cd
--- /dev/null
+++ b/libs/libnl/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -fp1 -i "$SPELL_DIRECTORY/fix-musl-compile-problem.patch"
diff --git a/libs/libnl/fix-musl-compile-problem.patch
b/libs/libnl/fix-musl-compile-problem.patch
new file mode 100644
index 0000000..0f08390
--- /dev/null
+++ b/libs/libnl/fix-musl-compile-problem.patch
@@ -0,0 +1,37 @@
+Subject: [PATCH] fix libnl-3.4.0 musl compile problem
+Avoid in6_addr redefinition
+
+Upstream-Status: Pending
+
+Signed-off-by: Huang Qiyu <huangqy.fnst AT cn.fujitsu.com>
+---
+ include/linux-private/linux/if_bridge.h | 1 -
+ include/linux-private/linux/ipv6.h | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/include/linux-private/linux/if_bridge.h
b/include/linux-private/linux/if_bridge.h
+index f24050b..8f7490c 100644
+--- a/include/linux-private/linux/if_bridge.h
++++ b/include/linux-private/linux/if_bridge.h
+@@ -15,7 +15,6 @@
+
+ #include <linux/types.h>
+ #include <linux/if_ether.h>
+-#include <linux/in6.h>
+
+ #define SYSFS_BRIDGE_ATTR "bridge"
+ #define SYSFS_BRIDGE_FDB "brforward"
+diff --git a/include/linux-private/linux/ipv6.h
b/include/linux-private/linux/ipv6.h
+index e05e684..f16349d 100644
+--- a/include/linux-private/linux/ipv6.h
++++ b/include/linux-private/linux/ipv6.h
+@@ -2,7 +2,6 @@
+ #define _IPV6_H
+
+ #include <asm/byteorder.h>
+-#include <linux/in6.h>
+
+ /* The latest drafts declared increase in minimal mtu up to 1280. */
+
+--
+2.7.4
diff --git a/video-libs/libdv/HISTORY b/video-libs/libdv/HISTORY
index 4632d66..16a2df2 100644
--- a/video-libs/libdv/HISTORY
+++ b/video-libs/libdv/HISTORY
@@ -1,3 +1,6 @@
+2019-05-21 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Fixed build against musl
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/video-libs/libdv/PRE_BUILD b/video-libs/libdv/PRE_BUILD
new file mode 100755
index 0000000..3c8cac2
--- /dev/null
+++ b/video-libs/libdv/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (489accc04ee6fb5859b28cbd0dc8c8682e11346b), Ismael Luceno, 05/21/2019

Archive powered by MHonArc 2.6.24.

Top of Page