d71b9a7269
2.4.4 => 2.4.8
2.5.2 => 2.5.4
2.6 => 2.6.1
Python 2.4 and 2.5 lose their build knobs to match 2.6.
Removes no longer needed Python 2.5 security patches backported
from the release25-maint SVN branch.
Remove the -bz2 subpackage from all three versions. It is silly
to make a subpackage to avoid depending on something tiny and
compatibly licensed.
Python 2.4 and 2.5 lose their -expat subpackages; expat has been
in base for some time.
Python 2.5 loses its sqlite subpackge. Again, sqlite is tiny,
compatibly licensed and is depended upon by more and more
applications. This brings it into line with the 2.6 version.
Rework all three version's handling of setup.py. Rather than regex
replacing LOCALBASE and X11BASE into setup.py post-configure, these
are passed in though environment variables. Will save hours of
frustrated cursing familiar to anyone who has accidently used the
update-patches target after configure and had to go back and redo
all the substitutions.
Rework the patching of setup.py for 2.4 and 2.5 to be more like
what we do for 2.6. I.e. keep the diff minimal and avoid deleting
huge blocks of code, so the diff has a chance of applying without
massive hand-editing each patch release.
Fix .py paths in installed .pyc files (patch from eric@)
feedback from several, particularly eric@, ajacoutot@ and Ingo
Schwarze; "get it in" ajacoutot@
69 lines
2.5 KiB
Plaintext
69 lines
2.5 KiB
Plaintext
$OpenBSD: patch-Makefile_pre_in,v 1.4 2009/01/01 21:03:27 djm Exp $
|
|
--- Makefile.pre.in.orig Mon Oct 9 03:41:25 2006
|
|
+++ Makefile.pre.in Fri Dec 26 12:27:16 2008
|
|
@@ -315,7 +315,7 @@ all: $(BUILDPYTHON) oldsharedmods sharedmods
|
|
$(BUILDPYTHON): Modules/$(MAINOBJ) $(LIBRARY) $(LDLIBRARY)
|
|
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
|
|
Modules/$(MAINOBJ) \
|
|
- $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
|
+ -lpython$(VERSION) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
|
|
|
platform: $(BUILDPYTHON)
|
|
$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
|
|
@@ -364,6 +364,11 @@ libpython$(VERSION).so: $(LIBRARY_OBJS)
|
|
libpython$(VERSION).sl: $(LIBRARY_OBJS)
|
|
$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
|
|
|
|
+# This rule for OpenBSD...
|
|
+$(LDLIBRARY): $(LIBRARY)
|
|
+ $(LDSHARED) -o $@ $(LIBRARY_OBJS)
|
|
+
|
|
+
|
|
# 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.
|
|
@@ -626,7 +631,6 @@ bininstall: altbininstall
|
|
then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
|
|
else true; \
|
|
fi
|
|
- (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
|
|
|
|
# Install the interpreter with $(VERSION) affixed
|
|
# This goes into $(exec_prefix)
|
|
@@ -637,7 +641,7 @@ altbininstall: $(BUILDPYTHON)
|
|
exit 1; \
|
|
fi; \
|
|
fi
|
|
- @for i in $(BINDIR) $(LIBDIR); \
|
|
+ @for i in $(BINDIR) $(LIBDIR) $(LIBPL); \
|
|
do \
|
|
if test ! -d $(DESTDIR)$$i; then \
|
|
echo "Creating directory $$i"; \
|
|
@@ -646,14 +650,12 @@ altbininstall: $(BUILDPYTHON)
|
|
fi; \
|
|
done
|
|
$(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE)
|
|
- if test -f libpython$(VERSION)$(SO); then \
|
|
+ if test -f $(LDLIBRARY); then \
|
|
if test "$(SO)" = .dll; then \
|
|
$(INSTALL_SHARED) libpython$(VERSION)$(SO) $(DESTDIR)$(BINDIR); \
|
|
else \
|
|
- $(INSTALL_SHARED) libpython$(VERSION)$(SO) $(DESTDIR)$(LIBDIR)/$(INSTSONAME); \
|
|
- if test libpython$(VERSION)$(SO) != $(INSTSONAME); then \
|
|
- (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \
|
|
- fi \
|
|
+ $(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(LIBPL)/$(LDLIBRARY); \
|
|
+ (cd $(DESTDIR)$(LIBDIR); $(LN) -s python$(VERSION)/config/$(LDLIBRARY)); \
|
|
fi; \
|
|
else true; \
|
|
fi
|
|
@@ -669,7 +671,7 @@ maninstall:
|
|
fi; \
|
|
done
|
|
$(INSTALL_DATA) $(srcdir)/Misc/python.man \
|
|
- $(DESTDIR)$(MANDIR)/man1/python.1
|
|
+ $(DESTDIR)$(MANDIR)/man1/python$(VERSION).1
|
|
|
|
# Install the library
|
|
PLATDIR= plat-$(MACHDEP)
|