<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/457c3a914ece3ca5faec5fd461023ef2abbdbfef">https://github.com/macports/macports-ports/commit/457c3a914ece3ca5faec5fd461023ef2abbdbfef</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 457c3a9 python26: build fixes
</span>457c3a9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 457c3a914ece3ca5faec5fd461023ef2abbdbfef
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Mar 9 12:57:26 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> python26: build fixes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/57295
</span>---
lang/python26/files/patch-Makefile.pre.in.diff | 22 ++++++++++++++++++----
lang/python26/files/patch-libedit.diff | 13 +++++++++++--
2 files changed, 29 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python26/files/patch-Makefile.pre.in.diff b/lang/python26/files/patch-Makefile.pre.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 29adf5f..0d8a1b7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python26/files/patch-Makefile.pre.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python26/files/patch-Makefile.pre.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.pre.in.orig 2013-10-29 10:04:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.pre.in 2016-09-27 02:53:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.pre.in.orig 2013-10-30 02:04:38.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.pre.in 2019-03-09 12:40:05.000000000 +1100
</span> @@ -395,8 +395,8 @@
# Build the shared modules
sharedmods: $(BUILDPYTHON)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,21 @@
</span> esac
# Build static library
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1002,7 +1002,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -442,8 +442,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -compatibility_version $(VERSION) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -current_version $(VERSION); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/bin/libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @LIBTOOL_CRUFT@ ;\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) -o $(LDLIBRARY) $(LDFLAGS) -dynamiclib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -all_load $(LIBRARY) -Wl,-single_module \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -compatibility_version $(VERSION) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -current_version $(VERSION); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -d -m $(DIRMODE) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1002,7 +1005,7 @@
</span> # Install the dynamically loadable modules
# This goes into $(exec_prefix)
sharedinstall:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +34,7 @@
</span> --prefix=$(prefix) \
--install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1083,7 +1083,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1083,7 +1086,7 @@
</span> # This installs a few of the useful scripts in Tools/scripts
scriptsinstall:
SRCDIR=$(srcdir) $(RUNSHARED) \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python26/files/patch-libedit.diff b/lang/python26/files/patch-libedit.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d7f4b46..b6f4ee6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python26/files/patch-libedit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python26/files/patch-libedit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,8 +145,8 @@
</span> if readline_termcap_library:
pass # Issue 7384: Already linked against curses or tinfo.
elif curses_library:
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- Modules/readline.c.orig 2010-05-10 01:15:40.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Modules/readline.c 2011-10-31 14:43:16.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/readline.c.orig 2013-10-30 02:04:39.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/readline.c 2019-03-09 12:52:15.000000000 +1100
</span> @@ -28,8 +28,7 @@
/* GNU readline definitions */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,6 +173,15 @@
</span> Py_RETURN_NONE;
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -846,7 +843,7 @@ setup_readline(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_pre_input_hook = (Function *)on_pre_input_hook;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Set our completion function */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rl_attempted_completion_function = (CPPFunction *)flex_complete;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rl_attempted_completion_function = (rl_completion_func_t *)flex_complete;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Set Python word break characters */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_completer_word_break_characters =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strdup(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?");
</span> @@ -926,7 +923,6 @@ readline_until_enter_or_signal(char *pro
PyEval_SaveThread();
#endif
</pre><pre style='margin:0'>
</pre>