diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-10-16 23:36:32 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-10-16 23:36:32 +0000 |
| commit | b2c02c3cd7513b6fad49a0bd0c669f9a581f5cc8 (patch) | |
| tree | 7d37d088e9179f631f22143a980157da49a331a9 /packaging/macosx/ports/lang/python25/files/patch-configure.diff | |
| parent | Removed dangerous GTK-mimicking macros. (diff) | |
| parent | update to trunk (r13610) (diff) | |
| download | inkscape-b2c02c3cd7513b6fad49a0bd0c669f9a581f5cc8.tar.gz inkscape-b2c02c3cd7513b6fad49a0bd0c669f9a581f5cc8.zip | |
Merge in osx-packaging-update branch. OS X packaging now works correctly for trunk.
(bzr r13620)
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, 45 insertions, 0 deletions
diff --git a/packaging/macosx/ports/lang/python25/files/patch-configure.diff b/packaging/macosx/ports/lang/python25/files/patch-configure.diff new file mode 100644 index 000000000..22d260047 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-configure.diff @@ -0,0 +1,45 @@ +--- 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" |