| Message ID | 20191127080028.823495-1-raj.khem@gmail.com |
|---|---|
| State | Accepted |
| Commit | 84f890bc14d40a1f0b1ac347fc4c4c3fdec7e2c5 |
| Headers | show |
| Series | [oe,meta-oe] pidgin: Use python3 during build | expand |
On Wed, Nov 27, 2019 at 12:00:28AM -0800, Khem Raj wrote: >... > +@@ -1568,7 +1568,7 @@ dnl Check for Python headers (currently > + dnl (Thanks to XChat) > + if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then > + AC_MSG_CHECKING(for Python compile flags) > +- PKG_CHECK_MODULES(PY, python, [ > ++ PKG_CHECK_MODULES(PY, python3, [ > + AC_SUBST(PY_CFLAGS) > + AC_SUBST(PY_LIBS) > + ], [ >... This one also wants https://bitbucket.org/pidgin/main/pull-requests/357/gnt-fix-use-after-free-memory-violation/diff Not sure whether there are more fixes that need backporting for Python3. cu Adrian -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
On Wed, Nov 27, 2019 at 1:10 AM Adrian Bunk <bunk@stusta.de> wrote: > > On Wed, Nov 27, 2019 at 12:00:28AM -0800, Khem Raj wrote: > >... > > +@@ -1568,7 +1568,7 @@ dnl Check for Python headers (currently > > + dnl (Thanks to XChat) > > + if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then > > + AC_MSG_CHECKING(for Python compile flags) > > +- PKG_CHECK_MODULES(PY, python, [ > > ++ PKG_CHECK_MODULES(PY, python3, [ > > + AC_SUBST(PY_CFLAGS) > > + AC_SUBST(PY_LIBS) > > + ], [ > >... > > This one also wants > https://bitbucket.org/pidgin/main/pull-requests/357/gnt-fix-use-after-free-memory-violation/diff > > Not sure whether there are more fixes that need backporting for Python3. > Good question. So I checked the plugins which generate .c files using these python scripts for dbus bindings dbus-bindings.c dbus-signals.c dbus-types.c purple-client-bindings.c and I regenerated manually using py2 and compared with py3 generated ones. They are identical. > cu > Adrian -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
diff --git a/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch b/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch new file mode 100644 index 0000000000..c7b4163cb5 --- /dev/null +++ b/meta-oe/recipes-support/pidgin/pidgin/use_py3.patch @@ -0,0 +1,20 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1488,7 +1488,7 @@ AC_ARG_WITH([python], + + if test "x$enable_dbus" = "xyes" || test "x$enable_consoleui" = "xyes" ; then + if test -z "$PYTHON" -o "x$PYTHON" = "xyes"; then +- AC_PATH_PROG([PYTHON], [python], [no]) ++ AC_PATH_PROG([PYTHON], [python3], [no]) + fi + + if test x"$PYTHON" = x"no" ; then +@@ -1568,7 +1568,7 @@ dnl Check for Python headers (currently + dnl (Thanks to XChat) + if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then + AC_MSG_CHECKING(for Python compile flags) +- PKG_CHECK_MODULES(PY, python, [ ++ PKG_CHECK_MODULES(PY, python3, [ + AC_SUBST(PY_CFLAGS) + AC_SUBST(PY_LIBS) + ], [ diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb b/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb index b4944258fa..fdc79e81b2 100644 --- a/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb +++ b/meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb @@ -11,6 +11,7 @@ SRC_URI = "\ file://sanitize-configure.ac.patch \ file://purple-OE-branding-25.patch \ file://pidgin-cross-python-265.patch \ + file://use_py3.patch \ " SRC_URI[md5sum] = "423403494fe1951e47cc75231f743bb0"
Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../pidgin/pidgin/use_py3.patch | 20 +++++++++++++++++++ .../recipes-support/pidgin/pidgin_2.13.0.bb | 1 + 2 files changed, 21 insertions(+) create mode 100644 meta-oe/recipes-support/pidgin/pidgin/use_py3.patch -- 2.24.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel