diff options
| author | Shlomi Fish <shlomif@shlomifish.org> | 2017-01-03 23:18:39 +0000 |
|---|---|---|
| committer | Shlomi Fish <shlomif@shlomifish.org> | 2017-01-03 23:18:39 +0000 |
| commit | 20124f96375afdfbf8ab58b6090db95ba0d2687b (patch) | |
| tree | 0f7e003dd9707b751c3b51e7b8133a21437ead95 /packaging/macosx/ports/lang/python25/files/patch-configure.diff | |
| parent | Merged. (diff) | |
| parent | Fix build on Windows (see http://inkscape.13.x6.nabble.com/compile-error-on-W... (diff) | |
| download | inkscape-20124f96375afdfbf8ab58b6090db95ba0d2687b.tar.gz inkscape-20124f96375afdfbf8ab58b6090db95ba0d2687b.zip | |
Merged.
(bzr r15369.1.5)
Diffstat (limited to 'packaging/macosx/ports/lang/python25/files/patch-configure.diff')
| -rw-r--r-- | packaging/macosx/ports/lang/python25/files/patch-configure.diff | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/packaging/macosx/ports/lang/python25/files/patch-configure.diff b/packaging/macosx/ports/lang/python25/files/patch-configure.diff deleted file mode 100644 index 22d260047..000000000 --- a/packaging/macosx/ports/lang/python25/files/patch-configure.diff +++ /dev/null @@ -1,45 +0,0 @@ ---- configure.orig 2008-12-14 01:13:52.000000000 +1100 -+++ configure 2011-05-10 16:25:02.000000000 +1000 -@@ -4534,9 +4534,11 @@ - ;; - # is there any other compiler on Darwin besides gcc? - Darwin*) -- BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd" -+ BASECFLAGS="$BASECFLAGS -mno-fused-madd" - if test "${enable_universalsdk}"; then -- BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}" -+ BASECFLAGS="__UNIVERSAL_CFLAGS__ -isysroot ${UNIVERSALSDK} ${BASECFLAGS}" -+ else -+ BASECFLAGS="-arch __BUILD_ARCH__ ${BASECFLAGS}" - fi - - ;; -@@ -11362,7 +11364,7 @@ - if test "${enable_universalsdk}"; then - : - else -- LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`" -+ LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only __BUILD_ARCH__" - fi - LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' - LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; -@@ -11374,7 +11376,7 @@ - else - LIBTOOL_CRUFT="" - fi -- LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`" -+ LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only __BUILD_ARCH__" - LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' - LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; - esac -@@ -11524,7 +11526,9 @@ - if test ${MACOSX_DEPLOYMENT_TARGET-${cur_target}} '>' 10.2 - then - if test "${enable_universalsdk}"; then -- LDFLAGS="-arch i386 -arch ppc -isysroot ${UNIVERSALSDK} ${LDFLAGS}" -+ LDFLAGS="__UNIVERSAL_LDFLAGS__ -isysroot ${UNIVERSALSDK} ${LDFLAGS}" -+ else -+ LDFLAGS="-arch __BUILD_ARCH__ ${LDFLAGS}" - fi - LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup' - BLDSHARED="$LDSHARED" |