dev-python/pygobject/files/pygobject-2.28.3-support_multiple_python_versions.patch

   1 From 2f75378f3c56f245cabdcd2c52b561dbb878db2d Mon Sep 17 00:00:00 2001
   2 From: Gilles Dartiguelongue <eva@gentoo.org>
   3 Date: Fri, 8 Apr 2011 15:43:39 +0200
   4 Subject: [PATCH 3/3] Enable support to build against multiple version of python
   5
   6 ---
   7  codegen/pygobject-codegen-2.0.in |    2 +-
   8  gi/Makefile.am                   |    2 +-
   9  gio/Makefile.am                  |    2 +-
  10  glib/Makefile.am                 |   10 +++++-----
  11  gobject/Makefile.am              |    2 +-
  12  5 files changed, 9 insertions(+), 9 deletions(-)
  13
  14 diff --git a/codegen/pygobject-codegen-2.0.in b/codegen/pygobject-codegen-2.0.in
  15 index c04451b..194e5ba 100644
  16 --- a/codegen/pygobject-codegen-2.0.in
  17 +++ b/codegen/pygobject-codegen-2.0.in
  18 @@ -4,7 +4,7 @@ prefix=@prefix@
  19  exec_prefix=@exec_prefix@
  20  datarootdir=@datarootdir@
  21  datadir=@datadir@
  22 -codegendir=@pyexecdir@/gtk-2.0/codegen
  23 +codegendir=$(@PYTHON@ -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, prefix='@exec_prefix@')")/gtk-2.0/codegen
  24
  25  PYTHONPATH=$codegendir
  26  export PYTHONPATH
  27 diff --git a/gi/Makefile.am b/gi/Makefile.am
  28 index 31f6c79..8690522 100644
  29 --- a/gi/Makefile.am
  30 +++ b/gi/Makefile.am
  31 @@ -25,7 +25,7 @@ _gi_la_LDFLAGS = \
  32         -export-symbols-regex "init_gi|PyInit__gi"
  33  _gi_la_LIBADD = \
  34         $(GI_LIBS) \
  35 -       $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
  36 +       $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
  37  _gi_la_SOURCES = \
  38         pygi-repository.c \
  39         pygi-repository.h \
  40 diff --git a/gio/Makefile.am b/gio/Makefile.am
  41 index 6b3eb57..00e1c54 100644
  42 --- a/gio/Makefile.am
  43 +++ b/gio/Makefile.am
  44 @@ -67,7 +67,7 @@ EXTRA_DIST += $(GIO_DEFS) $(GIO_OVERRIDES)
  45  gio.c: $(GIO_DEFS) $(GIO_OVERRIDES)
  46  _gio_la_CFLAGS = $(GIO_CFLAGS)
  47  _gio_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gio
  48 -_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
  49 +_gio_la_LIBADD = $(GIO_LIBS) $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
  50  _gio_la_SOURCES = \
  51         giomodule.c \
  52         pygio-utils.c \
  53 diff --git a/glib/Makefile.am b/glib/Makefile.am
  54 index e210318..df39687 100644
  55 --- a/glib/Makefile.am
  56 +++ b/glib/Makefile.am
  57 @@ -4,7 +4,7 @@ INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -DPY_SSIZE_T_CLEAN
  58  pkgincludedir = $(includedir)/pygtk-2.0
  59  pkginclude_HEADERS = pyglib.h
  60
  61 -lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@.la
  62 +lib_LTLIBRARIES = libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
  63
  64  pkgpyexecdir = $(pyexecdir)
  65
  66 @@ -19,9 +19,9 @@ if PLATFORM_WIN32
  67  common_ldflags += -no-undefined
  68  endif
  69
  70 -libpyglib_2_0_@PYTHON_BASENAME@_la_CFLAGS = $(GLIB_CFLAGS)
  71 -libpyglib_2_0_@PYTHON_BASENAME@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
  72 -libpyglib_2_0_@PYTHON_BASENAME@_la_SOURCES =   \
  73 +libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_CFLAGS = $(GLIB_CFLAGS)
  74 +libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
  75 +libpyglib_2_0_@PYTHON_BASENAME@@PYTHON_VERSION@_la_SOURCES =   \
  76         pyglib.c                \
  77         pyglib.h                \
  78         pyglib-private.h        \
  79 @@ -29,7 +29,7 @@ libpyglib_2_0_@PYTHON_BASENAME@_la_SOURCES =  \
  80
  81  _glib_la_CFLAGS = $(GLIB_CFLAGS)
  82  _glib_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_glib|PyInit__glib"
  83 -_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@.la
  84 +_glib_la_LIBADD = $(GLIB_LIBS) libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
  85  _glib_la_SOURCES =             \
  86         glibmodule.c            \
  87         pygiochannel.c          \
  88 diff --git a/gobject/Makefile.am b/gobject/Makefile.am
  89 index 7208329..3f9ad8e 100644
  90 --- a/gobject/Makefile.am
  91 +++ b/gobject/Makefile.am
  92 @@ -35,7 +35,7 @@ _gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_gobject|PyInit__
  93  _gobject_la_LIBADD = \
  94         $(GLIB_LIBS) \
  95         $(FFI_LIBS) \
  96 -       $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@.la
  97 +       $(top_builddir)/glib/libpyglib-2.0-@PYTHON_BASENAME@@PYTHON_VERSION@.la
  98  _gobject_la_SOURCES =           \
  99          gobjectmodule.c         \
 100          pygboxed.c              \
 101 --
 102 1.7.4.1
 103