summaryrefslogtreecommitdiff
path: root/libraries/libsigrokdecode
diff options
context:
space:
mode:
authorDavid Spencer <baildon.research@googlemail.com>2015-12-22 10:37:46 +0000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-17 09:40:16 +0700
commitf8c699978fae801198d2c6a2f706e4f8d603abb8 (patch)
treec1bd1a105aa276a55400d4c43b818c2b2459e877 /libraries/libsigrokdecode
parentc04609e670d714dfdee88893b65d7ee7c81142c9 (diff)
downloadslackbuilds-f8c699978fae801198d2c6a2f706e4f8d603abb8.tar.gz
libraries/libsigrokdecode: Patched to build with python-3.5.
Signed-off-by: David Spencer <baildon.research@googlemail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries/libsigrokdecode')
-rw-r--r--libraries/libsigrokdecode/libsigrokdecode-0.3.1_python3-3.5.diff24
-rw-r--r--libraries/libsigrokdecode/libsigrokdecode.SlackBuild4
2 files changed, 28 insertions, 0 deletions
diff --git a/libraries/libsigrokdecode/libsigrokdecode-0.3.1_python3-3.5.diff b/libraries/libsigrokdecode/libsigrokdecode-0.3.1_python3-3.5.diff
new file mode 100644
index 0000000000..0d926d64ac
--- /dev/null
+++ b/libraries/libsigrokdecode/libsigrokdecode-0.3.1_python3-3.5.diff
@@ -0,0 +1,24 @@
+diff -u -r libsigrokdecode-0.3.1-orig/configure.ac libsigrokdecode-0.3.1/configure.ac
+--- libsigrokdecode-0.3.1-orig/configure.ac 2015-07-12 21:35:14.000000000 +0100
++++ libsigrokdecode-0.3.1/configure.ac 2015-12-21 19:23:07.809995006 +0000
+@@ -99,6 +99,11 @@
+ CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python3_CFLAGS";
+ LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python3_LIBS";
+ MODNAME_PYTHON="python3"],
++[PKG_CHECK_MODULES([python35], [python-3.5 >= 3.5],
++ [pyver=`$PKG_CONFIG --modversion python-3.5`;
++ CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python35_CFLAGS";
++ LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python35_LIBS";
++ MODNAME_PYTHON="python-3.5"],
+ [PKG_CHECK_MODULES([python34], [python-3.4 >= 3.4],
+ [pyver=`$PKG_CONFIG --modversion python-3.4`;
+ CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python34_CFLAGS";
+@@ -114,7 +119,7 @@
+ CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python32_CFLAGS";
+ LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python32_LIBS";
+ MODNAME_PYTHON="python-3.2"],
+-)])])])
++)])])])])
+ AC_SUBST(CPPFLAGS_PYTHON)
+ AC_SUBST(LDFLAGS_PYTHON)
+ AC_SUBST(MODNAME_PYTHON)
diff --git a/libraries/libsigrokdecode/libsigrokdecode.SlackBuild b/libraries/libsigrokdecode/libsigrokdecode.SlackBuild
index 9326b8e42b..61f08ede23 100644
--- a/libraries/libsigrokdecode/libsigrokdecode.SlackBuild
+++ b/libraries/libsigrokdecode/libsigrokdecode.SlackBuild
@@ -69,6 +69,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Patch to add Python 3.5 support
+patch -p1 < $CWD/libsigrokdecode-0.3.1_python3-3.5.diff
+autoreconf
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \