summaryrefslogtreecommitdiffstats
path: root/display/fbterm
diff options
context:
space:
mode:
authorIsmael Luceno2019-06-02 22:07:49 +0200
committerIsmael Luceno2019-06-02 22:07:49 +0200
commit052046e3dee50d0b4893779ffbb6656126a68269 (patch)
treeae880a434867e545c6e2e99dd7527419a2f33beb /display/fbterm
parent6c753336f8e3f3ab25a0c9c8a3f6c1b8fed33495 (diff)
fbterm: Add missing edit for musl
Diffstat (limited to 'display/fbterm')
-rw-r--r--display/fbterm/HISTORY3
-rwxr-xr-xdisplay/fbterm/PRE_BUILD2
2 files changed, 5 insertions, 0 deletions
diff --git a/display/fbterm/HISTORY b/display/fbterm/HISTORY
index 5359dd14f9..3b9e41f04d 100644
--- a/display/fbterm/HISTORY
+++ b/display/fbterm/HISTORY
@@ -1,3 +1,6 @@
+2019-06-02 Ismael Luceno <ismael@sourcemage.org>
+ * PRE_BUILD: Added missing edit for musl
+
2019-05-21 Ismael Luceno <ismael@sourcemage.org>
* PRE_BUILD, fix-musl-compile.patch: Fixed build against musl
diff --git a/display/fbterm/PRE_BUILD b/display/fbterm/PRE_BUILD
index 11fe7e6b6b..891264a5fe 100755
--- a/display/fbterm/PRE_BUILD
+++ b/display/fbterm/PRE_BUILD
@@ -2,4 +2,6 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
patch -fp1 -i "$SPELL_DIRECTORY/fix-musl-compile.patch" &&
+# Use system signalfd.h instead of the bundled one
+sedit '/^#include "signalfd/{s!"!<sys/!;s!"$!>!}' src/fbterm.cpp &&
patch -fp1 -i "$SPELL_DIRECTORY/0001-fix-compilation-with-gcc-7.patch"