diff options
Diffstat (limited to 'lang/python23/patches/patch-ah')
| -rw-r--r-- | lang/python23/patches/patch-ah | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/lang/python23/patches/patch-ah b/lang/python23/patches/patch-ah index 6ca5dc28cc8..44d54c20bb2 100644 --- a/lang/python23/patches/patch-ah +++ b/lang/python23/patches/patch-ah @@ -1,22 +1,27 @@ -$NetBSD: patch-ah,v 1.6 2005/03/07 12:11:49 dmcmahill Exp $ +$NetBSD: patch-ah,v 1.7 2008/11/10 19:41:47 wiz Exp $ ---- Makefile.pre.in.orig 2005-01-11 08:48:52.000000000 -0500 -+++ Makefile.pre.in 2005-03-07 06:41:33.425152000 -0500 -@@ -57,5 +57,5 @@ +--- Makefile.pre.in.orig 2005-01-11 13:49:02.000000000 +0000 ++++ Makefile.pre.in +@@ -56,7 +56,7 @@ MAKESETUP= $(srcdir)/Modules/makese + OPT= @OPT@ BASECFLAGS= @BASECFLAGS@ CFLAGS= $(BASECFLAGS) $(OPT) -CPPFLAGS= -I. -I$(srcdir)/Include +CPPFLAGS+= @CPPFLAGS@ -I. -I$(srcdir)/Include LDFLAGS= @LDFLAGS@ LDLAST= @LDLAST@ -@@ -309,5 +309,5 @@ + SGI_ABI= @SGI_ABI@ +@@ -308,7 +308,7 @@ all: $(BUILDPYTHON) oldsharedmods share + $(BUILDPYTHON): Modules/$(MAINOBJ) $(LIBRARY) $(LDLIBRARY) $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \ Modules/$(MAINOBJ) \ - $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) + $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) ${LINK_ALL_LIBGCC_HACK} platform: $(BUILDPYTHON) -@@ -349,8 +349,8 @@ + $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform +@@ -348,15 +348,18 @@ $(LIBRARY): $(LIBRARY_OBJS) + libpython$(VERSION).so: $(LIBRARY_OBJS) if test $(INSTSONAME) != $(LDLIBRARY); then \ - $(LDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \ @@ -27,7 +32,7 @@ $NetBSD: patch-ah,v 1.6 2005/03/07 12:11:49 dmcmahill Exp $ + $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LDFLAGS) $(SHLIBS) $(LIBC) $(LIBM); \ fi -@@ -358,4 +358,7 @@ + libpython$(VERSION).sl: $(LIBRARY_OBJS) $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM) +libpython$(VERSION).dylib: $(LIBRARY_OBJS) @@ -35,7 +40,9 @@ $NetBSD: patch-ah,v 1.6 2005/03/07 12:11:49 dmcmahill Exp $ + # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary # minimal framework (not including the Lib directory and such) in the current -@@ -617,5 +620,10 @@ + # directory. +@@ -616,7 +619,12 @@ altbininstall: $(BUILDPYTHON) + (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \ fi \ fi; \ - else true; \ @@ -47,3 +54,4 @@ $NetBSD: patch-ah,v 1.6 2005/03/07 12:11:49 dmcmahill Exp $ + fi \ fi + # Install the manual page |