<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/ffbc8774961735fd44e5cdf8421cb10a35212947">https://github.com/macports/macports-ports/commit/ffbc8774961735fd44e5cdf8421cb10a35212947</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 ffbc877 python27: update universal patch
</span>ffbc877 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ffbc8774961735fd44e5cdf8421cb10a35212947
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu May 3 00:57:44 2018 +1000
<span style='display:block; white-space:pre;color:#404040;'> python27: update universal patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/56407
</span>---
lang/python27/files/patch-configure-universal.diff | 105 ++++++++++-----------
1 file changed, 51 insertions(+), 54 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python27/files/patch-configure-universal.diff b/lang/python27/files/patch-configure-universal.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 25cec53..57b5956 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python27/files/patch-configure-universal.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python27/files/patch-configure-universal.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,56 +1,53 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2013-05-20 04:46:39.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2013-05-20 04:50:42.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6078,36 +6078,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXPORT_MACOSX_DEPLOYMENT_TARGET=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2018-04-30 08:47:33.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2018-05-03 00:56:16.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6121,47 +6121,9 @@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${enable_universalsdk}"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- UNIVERSAL_ARCH_FLAGS=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "$UNIVERSAL_ARCHS" = "32-bit" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ARCH_RUN_32BIT=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIPO_32BIT_FLAGS=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "${enable_universalsdk}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case "$UNIVERSAL_ARCHS" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 32-bit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIPO_32BIT_FLAGS=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ARCH_RUN_32BIT=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 64-bit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- UNIVERSAL_ARCH_FLAGS="-arch ppc64 -arch x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIPO_32BIT_FLAGS=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ARCH_RUN_32BIT=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- all)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- intel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- UNIVERSAL_ARCH_FLAGS="-arch i386 -arch x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIPO_32BIT_FLAGS="-extract i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ARCH_RUN_32BIT="/usr/bin/arch -i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- intel-32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- UNIVERSAL_ARCH_FLAGS="-arch i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIPO_32BIT_FLAGS=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ARCH_RUN_32BIT=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- intel-64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- UNIVERSAL_ARCH_FLAGS="-arch x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIPO_32BIT_FLAGS=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ARCH_RUN_32BIT=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 3-way)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- as_fn_error $? "proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- esac
</span> -
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- UNIVERSAL_ARCH_FLAGS="-arch ppc64 -arch x86_64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIPO_32BIT_FLAGS=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ARCH_RUN_32BIT="true"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elif test "$UNIVERSAL_ARCHS" = "all" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elif test "$UNIVERSAL_ARCHS" = "intel" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- UNIVERSAL_ARCH_FLAGS="-arch i386 -arch x86_64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIPO_32BIT_FLAGS="-extract i386"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ARCH_RUN_32BIT="/usr/bin/arch -i386"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elif test "$UNIVERSAL_ARCHS" = "3-way" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- as_fn_error $? "proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ UNIVERSAL_ARCH_FLAGS="__UNIVERSAL_ARCHFLAGS__"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ARCH_RUN_32BIT=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIPO_32BIT_FLAGS=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${UNIVERSAL_ARCH_FLAGS} ${CFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8605,8 +8605,11 @@ then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # building for OS X 10.3 and later
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "${enable_universalsdk}"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "${enable_universalsdk}" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LDFLAGS="${UNIVERSAL_ARCH_FLAGS} ${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "${UNIVERSALSDK}" != "/"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDSHARED='$(CC) -bundle -undefined dynamic_lookup'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDCXXSHARED='$(CXX) -bundle -undefined dynamic_lookup'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UNIVERSAL_ARCH_FLAGS="__UNIVERSAL_ARCHFLAGS__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ARCH_RUN_32BIT=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIPO_32BIT_FLAGS=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "${UNIVERSALSDK}" != "/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
</span></pre><pre style='margin:0'>
</pre>