Skip to Content.
Sympa Menu

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

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 (c6022abcf13b4d253b80d59ca62e7bfa53000bbb)
  • Date: Wed, 28 Aug 2019 20:03:46 +0000

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

libs/libieee1284/HISTORY | 3 +++
libs/libieee1284/PRE_BUILD | 4 ++++
libs/libieee1284/patches/musl.patch | 20 ++++++++++++++++++++
3 files changed, 27 insertions(+)

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

libieee1284: Fix build against musl

diff --git a/libs/libieee1284/HISTORY b/libs/libieee1284/HISTORY
index 37babc9..e5a9e5b 100644
--- a/libs/libieee1284/HISTORY
+++ b/libs/libieee1284/HISTORY
@@ -1,2 +1,5 @@
+2019-08-28 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, patches/musl.patch: Fixed build against musl
+
2016-03-07 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: spell created
diff --git a/libs/libieee1284/PRE_BUILD b/libs/libieee1284/PRE_BUILD
new file mode 100755
index 0000000..49ddb90
--- /dev/null
+++ b/libs/libieee1284/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
+sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub
diff --git a/libs/libieee1284/patches/musl.patch
b/libs/libieee1284/patches/musl.patch
new file mode 100644
index 0000000..10fcb6a
--- /dev/null
+++ b/libs/libieee1284/patches/musl.patch
@@ -0,0 +1,20 @@
+--- a/src/access_io.c
++++ b/src/access_io.c
+@@ -47,7 +47,7 @@
+ #include "parport.h"
+ #include "ppdev.h"
+
+-#ifdef HAVE_LINUX
++#if defined(HAVE_LINUX) && defined(__GLIBC__)
+
+ #ifdef HAVE_SYS_IO_H
+ #include <sys/io.h>
+@@ -62,7 +62,7 @@ struct iopbuf {
+ unsigned char port_value;
+ };
+
+-#elif defined(HAVE_CYGWIN_9X)
++#elif defined(HAVE_LINUX) && !defined(__GLIBC__) || defined(HAVE_CYGWIN_9X)
+
+ #include "io.h"
+



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (c6022abcf13b4d253b80d59ca62e7bfa53000bbb), Ismael Luceno, 08/28/2019

Archive powered by MHonArc 2.6.24.

Top of Page