50 lines
2.3 KiB
Plaintext
50 lines
2.3 KiB
Plaintext
$OpenBSD: patch-wxPython_config_py,v 1.4 2019/01/02 12:43:19 jca Exp $
|
|
Index: wxPython/config.py
|
|
--- wxPython/config.py.orig
|
|
+++ wxPython/config.py
|
|
@@ -131,7 +131,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
|
|
@@ -144,7 +144,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
|
|
|
|
@@ -171,7 +171,7 @@ SYS_WX_CONFIG = None # When installing an in tree buil
|
|
# build_options.py, if it is different to that. The default
|
|
# is to use the value of WX_CONFIG.
|
|
|
|
-WXPORT = 'gtk2' # On Linux/Unix there are several ports of wxWidgets available.
|
|
+WXPORT = 'gtk3' # On Linux/Unix there are several ports of wxWidgets available.
|
|
# Setting this value lets you select which will be used for
|
|
# the wxPython build. Possibilities are 'gtk', 'gtk2',
|
|
# 'gtk3', and 'x11'. Currently only gtk2, and gtk3 work.
|
|
@@ -512,7 +512,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
|
|
@@ -1036,8 +1036,6 @@ elif os.name == 'posix' or COMPILER == 'mingw32':
|
|
if debug:
|
|
cflags.append('-ggdb')
|
|
cflags.append('-O0')
|
|
- else:
|
|
- cflags.append('-O3')
|
|
|
|
lflags = getWxConfigValue('--libs')
|
|
MONOLITHIC = (lflags.find("_xrc") == -1)
|