Fix build when both py-gtk and py-gtk2 are installed
ok djm@
This commit is contained in:
parent
37d4ad765f
commit
e7d3541d7b
@ -1,6 +1,6 @@
|
|||||||
$OpenBSD: patch-setupext_py,v 1.5 2005/09/19 01:42:12 djm Exp $
|
$OpenBSD: patch-setupext_py,v 1.6 2005/12/12 07:27:18 alek Exp $
|
||||||
--- setupext.py.orig Wed Jul 6 01:36:37 2005
|
--- setupext.py.orig Tue Jul 5 17:36:37 2005
|
||||||
+++ setupext.py Mon Sep 19 10:46:46 2005
|
+++ setupext.py Sun Dec 11 17:11:50 2005
|
||||||
@@ -34,6 +34,7 @@ WIN32
|
@@ -34,6 +34,7 @@ WIN32
|
||||||
import os
|
import os
|
||||||
|
|
||||||
@ -18,3 +18,14 @@ $OpenBSD: patch-setupext_py,v 1.5 2005/09/19 01:42:12 djm Exp $
|
|||||||
libdirs = [os.path.join(p, 'lib') for p in basedir[sys.platform]
|
libdirs = [os.path.join(p, 'lib') for p in basedir[sys.platform]
|
||||||
if os.path.exists(p)]
|
if os.path.exists(p)]
|
||||||
module.include_dirs.extend(incdirs)
|
module.include_dirs.extend(incdirs)
|
||||||
|
@@ -174,7 +177,9 @@ def add_pygtk_flags(module):
|
||||||
|
pygtkIncludes = getoutput('pkg-config --cflags-only-I pygtk-2.0').split()
|
||||||
|
gtkIncludes = getoutput('pkg-config --cflags-only-I gtk+-2.0').split()
|
||||||
|
includes = pygtkIncludes + gtkIncludes
|
||||||
|
- module.include_dirs.extend([include[2:] for include in includes])
|
||||||
|
+ list = []
|
||||||
|
+ list.extend([include[2:] for include in includes])
|
||||||
|
+ module.include_dirs = list + module.include_dirs
|
||||||
|
|
||||||
|
pygtkLinker = getoutput('pkg-config --libs pygtk-2.0').split()
|
||||||
|
gtkLinker = getoutput('pkg-config --libs gtk+-2.0').split()
|
||||||
|
Loading…
Reference in New Issue
Block a user