diff options
Diffstat (limited to 'lang/python23/patches/patch-ah')
| -rw-r--r-- | lang/python23/patches/patch-ah | 38 |
1 files changed, 31 insertions, 7 deletions
diff --git a/lang/python23/patches/patch-ah b/lang/python23/patches/patch-ah index 025f4e92ffc..85812f00f2d 100644 --- a/lang/python23/patches/patch-ah +++ b/lang/python23/patches/patch-ah @@ -1,17 +1,17 @@ -$NetBSD: patch-ah,v 1.2 2004/01/26 12:10:24 grant Exp $ +$NetBSD: patch-ah,v 1.3 2004/11/28 13:33:19 recht Exp $ ---- Makefile.pre.in.orig 2003-11-19 06:54:00.000000000 +1100 -+++ Makefile.pre.in -@@ -56,7 +56,7 @@ MAKESETUP= $(srcdir)/Modules/makese +--- Makefile.pre.in.orig Tue Nov 18 20:54:00 2003 ++++ Makefile.pre.in Thu Nov 11 18:54:35 2004 +@@ -56,7 +56,7 @@ OPT= @OPT@ BASECFLAGS= @BASECFLAGS@ CFLAGS= $(BASECFLAGS) $(OPT) -CPPFLAGS= -I. -I$(srcdir)/Include -+CPPFLAGS+= -I. -I$(srcdir)/Include ++CPPFLAGS+= @CPPFLAGS@ -I. -I$(srcdir)/Include LDFLAGS= @LDFLAGS@ LDLAST= @LDLAST@ SGI_ABI= @SGI_ABI@ -@@ -305,7 +305,7 @@ all: $(BUILDPYTHON) oldsharedmods share +@@ -305,7 +305,7 @@ $(BUILDPYTHON): Modules/$(MAINOBJ) $(LIBRARY) $(LDLIBRARY) $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \ Modules/$(MAINOBJ) \ @@ -20,7 +20,7 @@ $NetBSD: patch-ah,v 1.2 2004/01/26 12:10:24 grant Exp $ platform: $(BUILDPYTHON) $(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform -@@ -345,7 +345,7 @@ $(LIBRARY): $(LIBRARY_OBJS) +@@ -345,7 +345,7 @@ libpython$(VERSION).so: $(LIBRARY_OBJS) if test $(INSTSONAME) != $(LDLIBRARY); then \ @@ -29,3 +29,27 @@ $NetBSD: patch-ah,v 1.2 2004/01/26 12:10:24 grant Exp $ $(LN) -f $(INSTSONAME) $@; \ else\ $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \ +@@ -354,6 +354,9 @@ + libpython$(VERSION).sl: $(LIBRARY_OBJS) + $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM) + ++libpython$(VERSION).dylib: $(LIBRARY_OBJS) ++ $(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ -current_version 2.3.4 -compatibility_version 2.3 -o $@ -flat_namespace -undefined suppress $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) ++ + # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary + # minimal framework (not including the Lib directory and such) in the current + # directory. +@@ -613,7 +616,12 @@ + (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \ + fi \ + fi; \ +- else true; \ ++ else \ ++ if test -f libpython$(VERSION).dylib; then \ ++ $(INSTALL_SHARED) libpython$(VERSION).dylib $(DESTDIR)$(LIBDIR)/libpython$(VERSION).dylib; \ ++ else \ ++ true; \ ++ fi \ + fi + + # Install the manual page |