Revision: 74203 http://trac.macports.org/changeset/74203 Author: stromnov@macports.org Date: 2010-12-07 03:10:03 -0800 (Tue, 07 Dec 2010) Log Message: ----------- python27: fix Makefile.pre patch (#27591); temporarily disable broken posixmodule.c.ed patch Modified Paths: -------------- trunk/dports/lang/python27/Portfile trunk/dports/lang/python27/files/patch-Makefile.pre.in.diff Modified: trunk/dports/lang/python27/Portfile =================================================================== --- trunk/dports/lang/python27/Portfile 2010-12-07 06:48:05 UTC (rev 74202) +++ trunk/dports/lang/python27/Portfile 2010-12-07 11:10:03 UTC (rev 74203) @@ -82,10 +82,10 @@ # system "cd ${worksrcpath} && ed - Modules/_localemodule.c < ${filespath}/_localemodule.c.ed" # system "cd ${worksrcpath} && ed - Lib/locale.py < ${filespath}/locale.py.ed" - if {${os.platform} == "darwin" && ${os.major} > 9} { - # http://trac.macports.org/ticket/21559 - system "cd ${worksrcpath} && ed - Modules/posixmodule.c < ${filespath}/posixmodule.c.ed" - } +# if {${os.platform} == "darwin" && ${os.major} > 9} { +# # http://trac.macports.org/ticket/21559 +# system "cd ${worksrcpath} && ed - Modules/posixmodule.c < ${filespath}/posixmodule.c.ed" +# } } build.target all Modified: trunk/dports/lang/python27/files/patch-Makefile.pre.in.diff =================================================================== --- trunk/dports/lang/python27/files/patch-Makefile.pre.in.diff 2010-12-07 06:48:05 UTC (rev 74202) +++ trunk/dports/lang/python27/files/patch-Makefile.pre.in.diff 2010-12-07 11:10:03 UTC (rev 74203) @@ -1,26 +1,26 @@ ---- Makefile.pre.in.orig 2008-06-19 20:47:03.000000000 -0600 -+++ Makefile.pre.in 2008-07-28 19:57:15.000000000 -0600 -@@ -394,8 +394,8 @@ +--- Makefile.pre.in.orig 2010-10-14 15:37:30.000000000 +0400 ++++ Makefile.pre.in 2010-12-07 12:21:35.000000000 +0300 +@@ -404,8 +404,8 @@ # Build the shared modules sharedmods: $(BUILDPYTHON) @case $$MAKEFLAGS in \ -- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ -- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' LDFLAGS='$(LDFLAGS)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ +- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ +- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ + *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q --no-user-cfg build;; \ + *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py --no-user-cfg build;; \ esac # Build static library -@@ -993,7 +993,7 @@ +@@ -1044,7 +1044,7 @@ # Install the dynamically loadable modules # This goes into $(exec_prefix) - sharedinstall: + sharedinstall: sharedmods - $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \ + $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py --no-user-cfg install \ --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ -@@ -1073,7 +1073,7 @@ +@@ -1117,7 +1117,7 @@ # This installs a few of the useful scripts in Tools/scripts scriptsinstall: SRCDIR=$(srcdir) $(RUNSHARED) \