summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsmael Luceno2019-05-31 21:29:29 +0200
committerIsmael Luceno2019-08-28 22:00:17 +0200
commitc6022abcf13b4d253b80d59ca62e7bfa53000bbb (patch)
tree23d1c9176ccce65f30352e54d3fafb937e665d78
parent3ed9ed811fc75327f6dc8e583af4b2d7180f73cb (diff)
libieee1284: Fix build against musl
-rw-r--r--libs/libieee1284/HISTORY3
-rwxr-xr-xlibs/libieee1284/PRE_BUILD4
-rw-r--r--libs/libieee1284/patches/musl.patch20
3 files changed, 27 insertions, 0 deletions
diff --git a/libs/libieee1284/HISTORY b/libs/libieee1284/HISTORY
index 37babc98af..e5a9e5b9ca 100644
--- a/libs/libieee1284/HISTORY
+++ b/libs/libieee1284/HISTORY
@@ -1,2 +1,5 @@
+2019-08-28 Ismael Luceno <ismael@sourcemage.org>
+ * PRE_BUILD, patches/musl.patch: Fixed build against musl
+
2016-03-07 Ismael Luceno <ismael@sourcemage.org>
* DETAILS: spell created
diff --git a/libs/libieee1284/PRE_BUILD b/libs/libieee1284/PRE_BUILD
new file mode 100755
index 0000000000..49ddb907ac
--- /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 0000000000..10fcb6ae70
--- /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"
+