You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
120 lines
4.4 KiB
120 lines
4.4 KiB
7 years ago
|
Index: Makefile.pre.in
|
||
|
|
--- Makefile.pre.in.orig 2016-06-28 08:14:38.973956000 +0200
|
||
|
|
+++ Makefile.pre.in 2016-06-28 08:16:58.953960097 +0200
|
||
|
|
@@ -970,26 +970,6 @@
|
||
|
|
# $(PYTHON) -> python2 -> python$(VERSION))
|
||
|
|
# Also create equivalent chains for other installed files
|
||
|
|
bininstall: altbininstall
|
||
|
|
- if test ! -d $(DESTDIR)$(LIBPC); then \
|
||
|
|
- echo "Creating directory $(LIBPC)"; \
|
||
|
|
- $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \
|
||
|
|
- fi
|
||
|
|
- -if test -f $(DESTDIR)$(BINDIR)/$(PYTHON) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON); \
|
||
|
|
- then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
|
||
|
|
- else true; \
|
||
|
|
- fi
|
||
|
|
- (cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON))
|
||
|
|
- -rm -f $(DESTDIR)$(BINDIR)/python2$(EXE)
|
||
|
|
- (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python2$(EXE))
|
||
|
|
- -rm -f $(DESTDIR)$(BINDIR)/python2-config
|
||
|
|
- (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python2-config)
|
||
|
|
- -rm -f $(DESTDIR)$(BINDIR)/python-config
|
||
|
|
- (cd $(DESTDIR)$(BINDIR); $(LN) -s python2-config python-config)
|
||
|
|
- -test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC)
|
||
|
|
- -rm -f $(DESTDIR)$(LIBPC)/python2.pc
|
||
|
|
- (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python2.pc)
|
||
|
|
- -rm -f $(DESTDIR)$(LIBPC)/python.pc
|
||
|
|
- (cd $(DESTDIR)$(LIBPC); $(LN) -s python2.pc python.pc)
|
||
|
|
|
||
|
|
# Install the interpreter with $(VERSION) affixed
|
||
|
|
# This goes into $(exec_prefix)
|
||
|
|
Index: configure
|
||
|
|
--- configure.orig 2016-06-25 23:49:32.000000000 +0200
|
||
|
|
+++ configure 2016-06-28 08:14:38.983933529 +0200
|
||
|
|
@@ -4235,9 +4235,9 @@
|
||
|
|
CFLAGS=$ac_save_CFLAGS
|
||
|
|
elif test $ac_cv_prog_cc_g = yes; then
|
||
|
|
if test "$GCC" = yes; then
|
||
|
|
- CFLAGS="-g -O2"
|
||
|
|
+ CFLAGS="-O2"
|
||
|
|
else
|
||
|
|
- CFLAGS="-g"
|
||
|
|
+ CFLAGS=""
|
||
|
|
fi
|
||
|
|
else
|
||
|
|
if test "$GCC" = yes; then
|
||
|
|
@@ -6006,7 +6006,7 @@
|
||
|
|
# debug builds.
|
||
|
|
OPT="-g -O0 -Wall $STRICT_PROTO"
|
||
|
|
else
|
||
|
|
- OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
|
||
|
|
+ OPT="$WRAP -O3 -Wall $STRICT_PROTO"
|
||
|
|
fi
|
||
|
|
;;
|
||
|
|
*)
|
||
|
|
@@ -8581,7 +8581,7 @@
|
||
|
|
then
|
||
|
|
LINKFORSHARED="-Wl,--export-dynamic"
|
||
|
|
fi;;
|
||
|
|
- SunOS/5*) case $CC in
|
||
|
|
+ SunOS/5*) case gcc in
|
||
|
|
*gcc*)
|
||
|
|
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
|
||
|
|
then
|
||
|
|
Index: setup.py
|
||
|
|
--- setup.py.orig 2016-06-25 23:49:32.000000000 +0200
|
||
|
|
+++ setup.py 2016-06-28 08:14:38.983933529 +0200
|
||
|
|
@@ -456,8 +456,8 @@
|
||
|
|
def detect_modules(self):
|
||
|
|
# Ensure that /usr/local is always used
|
||
|
|
if not cross_compiling:
|
||
|
|
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
|
||
|
|
- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
||
|
|
+ add_dir_to_list(self.compiler.library_dirs, '@l_prefix@/lib')
|
||
|
|
+ add_dir_to_list(self.compiler.include_dirs, '@l_prefix@/include')
|
||
|
|
if cross_compiling:
|
||
|
|
self.add_gcc_paths()
|
||
|
|
self.add_multiarch_paths()
|
||
|
|
@@ -809,8 +809,6 @@
|
||
|
|
libraries=math_libs) )
|
||
|
|
# Detect SSL support for the socket module (via _ssl)
|
||
|
|
search_for_ssl_incs_in = [
|
||
|
|
- '/usr/local/ssl/include',
|
||
|
|
- '/usr/contrib/ssl/include/'
|
||
|
|
]
|
||
|
|
ssl_incs = find_file('openssl/ssl.h', inc_dirs,
|
||
|
|
search_for_ssl_incs_in
|
||
|
|
@@ -821,8 +819,7 @@
|
||
|
|
if krb5_h:
|
||
|
|
ssl_incs += krb5_h
|
||
|
|
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
|
||
|
|
- ['/usr/local/ssl/lib',
|
||
|
|
- '/usr/contrib/ssl/lib/'
|
||
|
|
+ ['@l_prefix@/lib'
|
||
|
|
] )
|
||
|
|
|
||
|
|
if (ssl_incs is not None and
|
||
|
|
@@ -946,14 +943,8 @@
|
||
|
|
# top of the normal inc_dirs.
|
||
|
|
db_inc_paths = [
|
||
|
|
'/usr/include/db4',
|
||
|
|
- '/usr/local/include/db4',
|
||
|
|
'/opt/sfw/include/db4',
|
||
|
|
- '/usr/include/db3',
|
||
|
|
- '/usr/local/include/db3',
|
||
|
|
- '/opt/sfw/include/db3',
|
||
|
|
- # Fink defaults (http://fink.sourceforge.net/)
|
||
|
|
'/sw/include/db4',
|
||
|
|
- '/sw/include/db3',
|
||
|
|
]
|
||
|
|
# 4.x minor number specific paths
|
||
|
|
for x in gen_db_minor_ver_nums(4):
|
||
|
|
@@ -1916,6 +1907,7 @@
|
||
|
|
dotversion = dotversion[:-1] + '.' + dotversion[-1]
|
||
|
|
tcl_include_sub = []
|
||
|
|
tk_include_sub = []
|
||
|
|
+ dotversion = ''
|
||
|
|
for dir in inc_dirs:
|
||
|
|
tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
|
||
|
|
tk_include_sub += [dir + os.sep + "tk" + dotversion]
|