diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-12-01 11:15:54 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-12-01 11:16:42 +0100 |
| commit | fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb (patch) | |
| tree | fd6edbe93b19b167b105897e3de6a7c11eac4f9c /package/evemu/evemu-0005-configure.ac-add-disable-python-bindings-option.patch | |
| parent | 9a5434fbfc98a0c427c880b167b8ca3499b44e87 (diff) | |
| parent | 9b47f40bb29d9be34afabfb423bab0ad45cbc11f (diff) | |
| download | buildroot-fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb.tar.gz buildroot-fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb.zip | |
Merge branch 'next'
Conflicts:
Makefile
package/flac/0001-fix-altivec-logic.patch
package/grantlee/Config.in
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/evemu/evemu-0005-configure.ac-add-disable-python-bindings-option.patch')
| -rw-r--r-- | package/evemu/evemu-0005-configure.ac-add-disable-python-bindings-option.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/package/evemu/evemu-0005-configure.ac-add-disable-python-bindings-option.patch b/package/evemu/evemu-0005-configure.ac-add-disable-python-bindings-option.patch deleted file mode 100644 index 177d01829b..0000000000 --- a/package/evemu/evemu-0005-configure.ac-add-disable-python-bindings-option.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4618fb3b788715c754872df5fed7bce0186f5089 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <ps.report@gmx.net> -Date: Sun, 27 Apr 2014 13:23:41 +0200 -Subject: [PATCH] configure.ac: add '--disable-python-bindings' option - -Signed-off-by: Peter Seiderer <ps.report@gmx.net> ---- - Makefile.am | 2 +- - configure.ac | 11 +++++++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index a83b35f..fb87c76 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = src tools python $(SUBDIR_TESTS) -+SUBDIRS = src tools $(SUBDIR_PYTHON_BINDINGS) $(SUBDIR_TESTS) - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = evemu.pc -diff --git a/configure.ac b/configure.ac -index c7e16b3..72c5fdf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -54,6 +54,17 @@ AS_IF([test "x$enable_tests" != "xno"], [ - - AC_SUBST([SUBDIR_TESTS]) - -+AC_ARG_ENABLE([python-bindings], -+ AS_HELP_STRING([--disable-python-bindings], -+ [Disable generation of python bindings])) -+ -+AS_IF([test "x$enable_python_bindings" != "xno"], [ -+ SUBDIR_PYTHON_BINDINGS=python -+]) -+ -+AC_SUBST([SUBDIR_PYTHON_BINDINGS]) -+ -+ - AC_SUBST(AM_CFLAGS, - "-Wall -Wextra") - --- -1.8.1.4 - |
