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/dbus-python/dbus-python-0001-fix-python-configure-check.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/dbus-python/dbus-python-0001-fix-python-configure-check.patch')
| -rw-r--r-- | package/dbus-python/dbus-python-0001-fix-python-configure-check.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/package/dbus-python/dbus-python-0001-fix-python-configure-check.patch b/package/dbus-python/dbus-python-0001-fix-python-configure-check.patch deleted file mode 100644 index 2df4da8884..0000000000 --- a/package/dbus-python/dbus-python-0001-fix-python-configure-check.patch +++ /dev/null @@ -1,27 +0,0 @@ -Python: add am_cv_python_includes to override runtime python-config check -[Gustavo: update for dbus-python 1.2.0] - -diff -Nura dbus-python-1.2.0.orig/configure dbus-python-1.2.0/configure ---- dbus-python-1.2.0.orig/configure 2013-05-08 04:48:42.000000000 -0300 -+++ dbus-python-1.2.0/configure 2014-07-03 16:54:25.922727033 -0300 -@@ -11762,6 +11762,12 @@ - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python headers using $PYTHON-config --includes" >&5 - $as_echo_n "checking for Python headers using $PYTHON-config --includes... " >&6; } -+if test "${am_cv_python_includes+set}" = set; then -+ $as_echo_n "(cached) $ECHO_C" >&6 -+ PYTHON_INCLUDES=${am_cv_python_includes} -+ { $as_echo "$as_me:$LINENO: result: $PYTHON_INCLUDES" >&5 -+$as_echo_t "${ECHO_T}$PYTHON_INCLUDES" >&6; } -+else - PYTHON_INCLUDES=`$PYTHON-config --includes` - if test $? = 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_INCLUDES" >&5 -@@ -11781,6 +11787,7 @@ - $as_echo "$PYTHON_INCLUDES" >&6; } - fi - fi -+fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether those headers are sufficient" >&5 - $as_echo_n "checking whether those headers are sufficient... " >&6; } |
