summaryrefslogtreecommitdiffstats
path: root/package/libserial/0001-disable-python-bindings.patch
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2015-09-01 09:59:08 +0200
committerPeter Korsgaard <peter@korsgaard.com>2015-09-01 09:59:08 +0200
commitcfc70a48027b1b56231df62a30a7da888f33e3ce (patch)
treecb2e856d51f1a79822a2b21d8c2cbaea55ae170d /package/libserial/0001-disable-python-bindings.patch
parent70874e321dbd50203187c41214cb888507cd6df1 (diff)
parentaa016797444017d4379a139e39697e38ed2e2357 (diff)
downloadbuildroot-cfc70a48027b1b56231df62a30a7da888f33e3ce.tar.gz
buildroot-cfc70a48027b1b56231df62a30a7da888f33e3ce.zip
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/libserial/0001-disable-python-bindings.patch')
-rw-r--r--package/libserial/0001-disable-python-bindings.patch21
1 files changed, 11 insertions, 10 deletions
diff --git a/package/libserial/0001-disable-python-bindings.patch b/package/libserial/0001-disable-python-bindings.patch
index 54b5cb6cf1..1f2f5ed7df 100644
--- a/package/libserial/0001-disable-python-bindings.patch
+++ b/package/libserial/0001-disable-python-bindings.patch
@@ -1,25 +1,26 @@
Disable build of Python bindings, which requires the sipconfig module.
Signed-off-by: Simon Dawson <spdawson@gmail.com>
+Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
-diff -Nurp a/Makefile.am b/Makefile.am
---- a/Makefile.am 2008-11-12 01:27:31.000000000 +0000
-+++ b/Makefile.am 2013-04-16 09:41:13.476002178 +0100
+diff -purN libserial-0.6.0rc2.orig/Makefile.am libserial-0.6.0rc2/Makefile.am
+--- libserial-0.6.0rc2.orig/Makefile.am 2014-06-05 18:37:25.000000000 +0200
++++ libserial-0.6.0rc2/Makefile.am 2015-07-30 20:59:28.828429011 +0200
@@ -1,4 +1,4 @@
-SUBDIRS=src doc examples sip
+SUBDIRS=src doc examples
+ ACLOCAL_AMFLAGS=-I m4
EXTRA_DIST = doxygen.conf.in Makefile.dist libserial.spec libserial.pc
-
-diff -Nurp a/Makefile.in b/Makefile.in
---- a/Makefile.in 2008-11-12 01:28:14.000000000 +0000
-+++ b/Makefile.in 2013-04-16 09:41:05.628013626 +0100
-@@ -197,7 +197,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+diff -purN libserial-0.6.0rc2.orig/Makefile.in libserial-0.6.0rc2/Makefile.in
+--- libserial-0.6.0rc2.orig/Makefile.in 2014-06-05 18:40:09.000000000 +0200
++++ libserial-0.6.0rc2/Makefile.in 2015-07-30 21:00:09.215188376 +0200
+@@ -348,7 +348,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = src doc examples sip
+SUBDIRS = src doc examples
+ ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = doxygen.conf.in Makefile.dist libserial.spec libserial.pc
pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libserial.pc
OpenPOWER on IntegriCloud