[dbus-python] adopt to new python

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10368 33e552b5-05e3-0310-8538-816dae2090ed

5 files changed, 8 insertions, 310 deletions

diff --git a/patches/dbus-python-0.83.0/generic/dbus-python-0.83.0-autogen.diff b/patches/dbus-python-0.83.0/generic/dbus-python-0.83.0-autogen.diff
deleted file mode 100644
index 978875774..000000000
--- a/patches/dbus-python-0.83.0/generic/dbus-python-0.83.0-autogen.diff
+++ /dev/null
@@ -1,189 +0,0 @@
----
- configure  |   71 ++++++++++++++++++++++++++++++++++++-------------------------
- aclocal.m4 |    1 
- 2 files changed, 44 insertions(+), 28 deletions(-)
-
-Index: dbus-python-0.83.0/aclocal.m4
-===================================================================
---- dbus-python-0.83.0.orig/aclocal.m4
-+++ dbus-python-0.83.0/aclocal.m4
-@@ -7873,3 +7873,4 @@ m4_include([m4/am-check-pymod.m4])
- m4_include([m4/am-check-python-headers.m4])
- m4_include([m4/dbus-py-add-rst2htmlflag.m4])
- m4_include([m4/jh-add-cflag.m4])
-+
-Index: dbus-python-0.83.0/configure
-===================================================================
---- dbus-python-0.83.0.orig/configure
-+++ dbus-python-0.83.0/configure
-@@ -1503,6 +1503,7 @@ Optional Packages:
-   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-   --with-pic              try to use only PIC/non-PIC objects [default=use
-                           both]
-+  --with-python-includes  set python include path manually
- 
- Some influential environment variables:
-   CC          C compiler command
-@@ -4366,7 +4367,7 @@ ia64-*-hpux*)
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 4369 "configure"' > conftest.$ac_ext
-+  echo '#line 4370 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -6456,11 +6457,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:6459: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:6460: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:6463: \$? = $ac_status" >&5
-+   echo "$as_me:6464: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -6746,11 +6747,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:6749: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:6750: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:6753: \$? = $ac_status" >&5
-+   echo "$as_me:6754: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -6850,11 +6851,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:6853: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:6854: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:6857: \$? = $ac_status" >&5
-+   echo "$as_me:6858: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -7111,7 +7112,7 @@ EOF
- 
- 	if test $supports_anon_versioning = yes; then
- 	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
--  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+  cat $export_symbols | sed -e "s/\(.*\)/'"$ac_symprfx"'\1;/" >> $output_objdir/$libname.ver~
-   $echo "local: *; };" >> $output_objdir/$libname.ver~
- 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- 	fi
-@@ -8018,7 +8019,7 @@ else
-   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- fi
- need_lib_prefix=unknown
--hardcode_into_libs=no
-+hardcode_into_libs="no"
- 
- # when you set need_version to no, make sure it does not cause -set_version
- # flags to be left without arguments
-@@ -9227,7 +9228,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 9230 "configure"
-+#line 9231 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -9327,7 +9328,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 9330 "configure"
-+#line 9331 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -9855,16 +9856,16 @@ shlibpath_overrides_runpath=$shlibpath_o
- hardcode_action=$hardcode_action
- 
- # Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
-+hardcode_into_libs="no"
- 
- # Flag to hardcode \$libdir into a binary during linking.
- # This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-+hardcode_libdir_flag_spec=""
- 
- # If ld is used when linking, flag to hardcode \$libdir into
- # a binary during linking. This must work even if \$libdir does
- # not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-+hardcode_libdir_flag_spec_ld=""
- 
- # Whether we need a single -rpath flag with a separated argument.
- hardcode_libdir_separator=$lt_hardcode_libdir_separator
-@@ -10174,27 +10175,41 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" 
- 
- 
- 
--{ echo "$as_me:$LINENO: checking for Python headers using $PYTHON-config --includes" >&5
-+
-+# Check whether --with-python_includes was given.
-+if test "${with_python_includes+set}" = set; then
-+  withval=$with_python_includes;
-+    PYTHON_INCLUDES="-I${withval}/python${PYTHON_VERSION}"
-+    { echo "$as_me:$LINENO: Using manually defined python include path" >&5
-+echo "$as_me: Using manually defined python include path" >&6;}
-+
-+else
-+
-+    { echo "$as_me:$LINENO: checking for Python headers using $PYTHON-config --includes" >&5
- echo $ECHO_N "checking for Python headers using $PYTHON-config --includes... $ECHO_C" >&6; }
--PYTHON_INCLUDES=`$PYTHON-config --includes`
--if test $? = 0; then
--  { echo "$as_me:$LINENO: result: $PYTHON_INCLUDES" >&5
-+    PYTHON_INCLUDES=`$PYTHON-config --includes`
-+    if test $? = 0; then
-+      { echo "$as_me:$LINENO: result: $PYTHON_INCLUDES" >&5
- echo "${ECHO_T}$PYTHON_INCLUDES" >&6; }
--else
--  { echo "$as_me:$LINENO: result: failed, will try another way" >&5
-+    else
-+      { echo "$as_me:$LINENO: result: failed, will try another way" >&5
- echo "${ECHO_T}failed, will try another way" >&6; }
--  py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
--  py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
--  { echo "$as_me:$LINENO: checking for Python headers in $py_prefix and $py_exec_prefix" >&5
-+      py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-+      py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-+      { echo "$as_me:$LINENO: checking for Python headers in $py_prefix and $py_exec_prefix" >&5
- echo $ECHO_N "checking for Python headers in $py_prefix and $py_exec_prefix... $ECHO_C" >&6; }
--  PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
--  if test "$py_prefix" != "$py_exec_prefix"; then
--    PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
--  fi
--  { echo "$as_me:$LINENO: result: $PYTHON_INCLUDES" >&5
-+      PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-+      if test "$py_prefix" != "$py_exec_prefix"; then
-+        PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-+      fi
-+      { echo "$as_me:$LINENO: result: $PYTHON_INCLUDES" >&5
- echo "${ECHO_T}$PYTHON_INCLUDES" >&6; }
-+    fi
-+
-+
- fi
- 
-+
- { echo "$as_me:$LINENO: checking whether those headers are sufficient" >&5
- echo $ECHO_N "checking whether those headers are sufficient... $ECHO_C" >&6; }
- 
diff --git a/patches/dbus-python-0.83.0/generic/dbus-python-0.83.0-overwrite-includes.diff b/patches/dbus-python-0.83.0/generic/dbus-python-0.83.0-overwrite-includes.diff
deleted file mode 100644
index 62d966b26..000000000
--- a/patches/dbus-python-0.83.0/generic/dbus-python-0.83.0-overwrite-includes.diff
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: add python path for cross compiling
-
-When cross compiling dbus-python, we need to build a python for the
-"build" machine and one for the "host" system. The current test for
-python headers incorrectly grabs up the "build" headers, although this
-package is built for the "host" machine.
-
-This patch adds a "--with-python-includes=<path>" switch, which makes it
-possible to overwrite the autodetected path with a pre-known one. Thus
-it is possible for cross build systems like ptxdist, buildroot etc. to
-set an already known path while cross compiling.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
-
-Filed as: http://bugs.freedesktop.org/show_bug.cgi?id=21017
-
- m4/am-check-python-headers.m4 |   38 +++++++++++++++++++++++---------------
- 1 file changed, 23 insertions(+), 15 deletions(-)
-
-Index: dbus-python-0.83.0/m4/am-check-python-headers.m4
-===================================================================
---- dbus-python-0.83.0.orig/m4/am-check-python-headers.m4
-+++ dbus-python-0.83.0/m4/am-check-python-headers.m4
-@@ -5,21 +5,29 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
- [AC_REQUIRE([AM_PATH_PYTHON])
- dnl deduce PYTHON_INCLUDES
- 
--AC_MSG_CHECKING(for Python headers using $PYTHON-config --includes)
--PYTHON_INCLUDES=`$PYTHON-config --includes`
--if test $? = 0; then
--  AC_MSG_RESULT($PYTHON_INCLUDES)
--else
--  AC_MSG_RESULT([failed, will try another way])
--  py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
--  py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
--  AC_MSG_CHECKING(for Python headers in $py_prefix and $py_exec_prefix)
--  PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
--  if test "$py_prefix" != "$py_exec_prefix"; then
--    PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
--  fi
--  AC_MSG_RESULT($PYTHON_INCLUDES)
--fi
-+AC_ARG_WITH(python_includes, AC_HELP_STRING(
-+  [--with-python-includes], [set python include path manually]),
-+  [
-+    PYTHON_INCLUDES="-I${withval}/python${PYTHON_VERSION}"
-+    AC_MSG_NOTICE([Using manually defined python include path])
-+  ],[
-+    AC_MSG_CHECKING(for Python headers using $PYTHON-config --includes)
-+    PYTHON_INCLUDES=`$PYTHON-config --includes`
-+    if test $? = 0; then
-+      AC_MSG_RESULT($PYTHON_INCLUDES)
-+    else
-+      AC_MSG_RESULT([failed, will try another way])
-+      py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-+      py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-+      AC_MSG_CHECKING(for Python headers in $py_prefix and $py_exec_prefix)
-+      PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-+      if test "$py_prefix" != "$py_exec_prefix"; then
-+        PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-+      fi
-+      AC_MSG_RESULT($PYTHON_INCLUDES)
-+    fi
-+  ]
-+)
- 
- AC_MSG_CHECKING(whether those headers are sufficient)
- AC_SUBST(PYTHON_INCLUDES)
diff --git a/patches/dbus-python-0.83.0/generic/series b/patches/dbus-python-0.83.0/generic/series
deleted file mode 100644
index 495f67b25..000000000
--- a/patches/dbus-python-0.83.0/generic/series
+++ /dev/null
@@ -1,2 +0,0 @@
-dbus-python-0.83.0-overwrite-includes.diff
-dbus-python-0.83.0-autogen.diff
diff --git a/rules/dbus-python.in b/rules/dbus-python.in
index 6975a19cb..d2b5cdc11 100644
--- a/rules/dbus-python.in
+++ b/rules/dbus-python.in
@@ -2,7 +2,7 @@
 
 config DBUS_PYTHON
 	tristate
-	select PYTHON24
+	select PYTHON
 	select DBUS
 	select DBUS_GLIB
 	prompt "dbus-python"
diff --git a/rules/dbus-python.make b/rules/dbus-python.make
index d09da6824..a7d604cc5 100644
--- a/rules/dbus-python.make
+++ b/rules/dbus-python.make
@@ -23,6 +23,7 @@ DBUS_PYTHON_SUFFIX	:= tar.gz
 DBUS_PYTHON_URL		:= http://dbus.freedesktop.org/releases/dbus-python/$(DBUS_PYTHON).$(DBUS_PYTHON_SUFFIX)
 DBUS_PYTHON_SOURCE	:= $(SRCDIR)/$(DBUS_PYTHON).$(DBUS_PYTHON_SUFFIX)
 DBUS_PYTHON_DIR		:= $(BUILDDIR)/$(DBUS_PYTHON)
+DBUS_PYTHON_PKGDIR	:= $(PKGDIR)/$(DBUS_PYTHON)
 
 # ----------------------------------------------------------------------------
 # Get
@@ -33,22 +34,6 @@ $(DBUS_PYTHON_SOURCE):
 	@$(call get, DBUS_PYTHON)
 
 # ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/dbus-python.extract:
-	@$(call targetinfo)
-	@$(call clean, $(DBUS_PYTHON_DIR))
-	@$(call extract, DBUS_PYTHON)
-	@$(call patchin, DBUS_PYTHON)
-#	# touch autoconf files in correct order
-	cd $(DBUS_PYTHON_DIR); \
-	touch aclocal.m4; \
-	find . -name "Makefile.in" | xargs touch; \
-	touch config.h.in
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
@@ -61,8 +46,7 @@ DBUS_PYTHON_ENV 	:= $(CROSS_ENV)
 DBUS_PYTHON_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
 	--disable-html-docs \
-	--disable-api-docs \
-	--with-python-includes=$(SYSROOT)/usr/include
+	--disable-api-docs
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -80,37 +64,13 @@ $(STATEDIR)/dbus-python.targetinstall:
 	@$(call install_fixup, dbus-python,DEPENDS,)
 	@$(call install_fixup, dbus-python,DESCRIPTION,missing)
 
-
-	@for i in \
-		/usr/lib/python2.4/site-packages/dbus_bindings.pyc \
-		/usr/lib/python2.4/site-packages/dbus/bus.pyc \
-		/usr/lib/python2.4/site-packages/dbus/connection.pyc \
-		/usr/lib/python2.4/site-packages/dbus/dbus_bindings.pyc \
-		/usr/lib/python2.4/site-packages/dbus/_dbus.pyc \
-		/usr/lib/python2.4/site-packages/dbus/decorators.pyc \
-		/usr/lib/python2.4/site-packages/dbus/exceptions.pyc \
-		/usr/lib/python2.4/site-packages/dbus/_expat_introspect_parser.pyc \
-		/usr/lib/python2.4/site-packages/dbus/glib.pyc \
-		/usr/lib/python2.4/site-packages/dbus/gobject_service.pyc \
-		/usr/lib/python2.4/site-packages/dbus/__init__.pyc \
-		/usr/lib/python2.4/site-packages/dbus/lowlevel.pyc \
-		/usr/lib/python2.4/site-packages/dbus/mainloop/glib.pyc \
-		/usr/lib/python2.4/site-packages/dbus/mainloop/__init__.pyc \
-		/usr/lib/python2.4/site-packages/dbus/proxies.pyc \
-		/usr/lib/python2.4/site-packages/dbus/server.pyc \
-		/usr/lib/python2.4/site-packages/dbus/service.pyc \
-		/usr/lib/python2.4/site-packages/dbus/types.pyc \
-		/usr/lib/python2.4/site-packages/dbus/_version.pyc \
-	; do \
-		$(call install_copy, dbus-python, 0, 0, 0644, -, $$i); \
+	@cd "$(DBUS_PYTHON_PKGDIR)"; \
+		find ./usr/lib/python$(PYTHON_MAJORMINOR) \
+		\( -name "*.so" -o -name "*.pyc" \) | \
+		while read file; do \
+		$(call install_copy, dbus-python, 0, 0, 0644, -, $${file##.}); \
 	done
 
-	@$(call install_copy, dbus-python, 0, 0, 0644, -, \
-		/usr/lib/python2.4/site-packages/_dbus_bindings.so)
-
-	@$(call install_copy, dbus-python, 0, 0, 0644, -, \
-		/usr/lib/python2.4/site-packages/_dbus_glib_bindings.so)
-
 	@$(call install_finish, dbus-python)
 
 	@$(call touch)