58 lines
2.6 KiB
Plaintext
58 lines
2.6 KiB
Plaintext
$OpenBSD: patch-wxPython_config_py,v 1.2 2007/10/23 11:45:14 steven Exp $
|
|
--- wxPython/config.py.orig Wed Oct 3 11:20:46 2007
|
|
+++ wxPython/config.py Wed Oct 3 11:21:52 2007
|
|
@@ -121,7 +121,7 @@ UNDEF_NDEBUG = 1 # Python 2.2 on Unix/Linux by defau
|
|
NO_SCRIPTS = 0 # Don't install the tool scripts
|
|
NO_HEADERS = 0 # Don't install the wxPython *.h and *.i files
|
|
|
|
-INSTALL_MULTIVERSION = 1 # Install the packages such that multiple versions
|
|
+INSTALL_MULTIVERSION = 0 # Install the packages such that multiple versions
|
|
# can co-exist. When turned on the wx and wxPython
|
|
# pacakges will be installed in a versioned subdir
|
|
# of site-packages, and a *.pth file will be
|
|
@@ -134,7 +134,7 @@ INSTALL_MULTIVERSION = 1 # Install the packages such t
|
|
FLAVOUR = "" # Optional flavour string to be appended to VERSION
|
|
# in MULTIVERSION installs
|
|
|
|
-EP_ADD_OPTS = 1 # When doing MULTIVERSION installs the wx port and
|
|
+EP_ADD_OPTS = 0 # When doing MULTIVERSION installs the wx port and
|
|
# ansi/unicode settings can optionally be added to the
|
|
# subdir path used in site-packages
|
|
|
|
@@ -486,7 +486,7 @@ class wx_install_headers(distutils.command.install_hea
|
|
if not headers:
|
|
return
|
|
|
|
- root = self.root
|
|
+ root = "!!WRKINST!!"
|
|
#print "WXPREFIX is %s, root is %s" % (WXPREFIX, root)
|
|
# hack for universal builds, which append i386/ppc
|
|
# to the root
|
|
@@ -495,7 +495,7 @@ class wx_install_headers(distutils.command.install_hea
|
|
for header, location in headers:
|
|
install_dir = os.path.normpath(root +
|
|
WXPREFIX +
|
|
- '/include/wx-%d.%d/wx' % (VER_MAJOR, VER_MINOR) +
|
|
+ '/include/wx' +
|
|
location)
|
|
self.mkpath(install_dir)
|
|
(out, _) = self.copy_file(header, install_dir)
|
|
@@ -549,7 +549,7 @@ def find_data_files(srcdir, *wildcards):
|
|
|
|
def makeLibName(name):
|
|
if os.name == 'posix':
|
|
- libname = '%s_%s-%s' % (WXBASENAME, name, WXRELEASE)
|
|
+ libname = '%s_%s' % (WXBASENAME, name)
|
|
elif name:
|
|
libname = 'wxmsw%s%s_%s' % (WXDLLVER, libFlag(), name)
|
|
else:
|
|
@@ -893,8 +893,6 @@ elif os.name == 'posix':
|
|
if debug:
|
|
cflags.append('-g')
|
|
cflags.append('-O0')
|
|
- else:
|
|
- cflags.append('-O3')
|
|
|
|
lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
|
|
MONOLITHIC = (lflags.find("_xrc") == -1)
|