cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1b5dc4a595
openbsd-ports/lang/python/2.5/patches/patch-Makefile_pre_in

96 lines
3.7 KiB
Plaintext
Raw Normal View History

Updates and garbage collect all three Python ports: 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@
2009-01-01 16:03:27 -05:00
$OpenBSD: patch-Makefile_pre_in,v 1.6 2009/01/01 21:03:27 djm Exp $
--- Makefile.pre.in.orig Mon Sep 22 10:22:44 2008
+++ Makefile.pre.in Mon Dec 15 20:13:03 2008
fix intermitent race condition, no reason for ./Lib/plat-openbsd4 to match $(srcdir)/Lib/plat-openbsd4 except by accident...
2008-06-09 08:34:55 -04:00
@@ -332,6 +332,8 @@ LIBRARY_OBJS= \
#########################################################################
# Rules
+everything: all $(srcdir)/Lib/$(PLATDIR)
+
# Default target
all: $(BUILDPYTHON) oldsharedmods sharedmods
@@ -340,6 +342,7 @@ $(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRAR
Python 2.5
2006-11-01 15:59:18 -05:00
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
Modules/python.o \
$(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
fix intermitent race condition, no reason for ./Lib/plat-openbsd4 to match $(srcdir)/Lib/plat-openbsd4 except by accident...
2008-06-09 08:34:55 -04:00
@@ -376,6 +379,11 @@ libpython$(VERSION).so: $(LIBRARY_OBJS)
Python 2.5
2006-11-01 15:59:18 -05:00
libpython$(VERSION).sl: $(LIBRARY_OBJS)
Updates and garbage collect all three Python ports: 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@
2009-01-01 16:03:27 -05:00
$(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST)
Python 2.5
2006-11-01 15:59:18 -05:00
+# 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.
fix intermitent race condition, no reason for ./Lib/plat-openbsd4 to match $(srcdir)/Lib/plat-openbsd4 except by accident...
2008-06-09 08:34:55 -04:00
@@ -658,14 +666,13 @@ bininstall: altbininstall
Python 2.5
2006-11-01 15:59:18 -05:00
then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
else true; \
fi
- (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
python-2.5.2 tested with a full ports build by naddy@ ok pvalchev@
2008-02-26 19:30:47 -05:00
-rm -f $(DESTDIR)$(BINDIR)/python-config
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config)
Python 2.5
2006-11-01 15:59:18 -05:00
# Install the interpreter with $(VERSION) affixed
# This goes into $(exec_prefix)
altbininstall: $(BUILDPYTHON)
- @for i in $(BINDIR) $(LIBDIR); \
+ @for i in $(BINDIR) $(LIBDIR) $(LIBPL); \
do \
if test ! -d $(DESTDIR)$$i; then \
echo "Creating directory $$i"; \
fix intermitent race condition, no reason for ./Lib/plat-openbsd4 to match $(srcdir)/Lib/plat-openbsd4 except by accident...
2008-06-09 08:34:55 -04:00
@@ -674,14 +681,12 @@ altbininstall: $(BUILDPYTHON)
Python 2.5
2006-11-01 15:59:18 -05:00
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
fix intermitent race condition, no reason for ./Lib/plat-openbsd4 to match $(srcdir)/Lib/plat-openbsd4 except by accident...
2008-06-09 08:34:55 -04:00
@@ -697,7 +702,7 @@ maninstall:
Python 2.5
2006-11-01 15:59:18 -05:00
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)
fix intermitent race condition, no reason for ./Lib/plat-openbsd4 to match $(srcdir)/Lib/plat-openbsd4 except by accident...
2008-06-09 08:34:55 -04:00
@@ -725,7 +730,7 @@ LIBSUBDIRS= lib-tk site-packages test test/output test
nail down build order for parallel build. tested through a bulk build by sturm@
2007-11-03 07:16:21 -04:00
distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \
setuptools setuptools/command setuptools/tests setuptools.egg-info \
curses $(MACHDEPS)
-libinstall: $(BUILDPYTHON) $(srcdir)/Lib/$(PLATDIR)
+libinstall: $(srcdir)/Lib/$(PLATDIR)
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
if test ! -d $(DESTDIR)$$i; then \
fix intermitent race condition, no reason for ./Lib/plat-openbsd4 to match $(srcdir)/Lib/plat-openbsd4 except by accident...
2008-06-09 08:34:55 -04:00
@@ -799,8 +804,8 @@ libinstall: $(BUILDPYTHON) $(srcdir)/Lib/$(PLATDIR)
nail down build order for parallel build. tested through a bulk build by sturm@
2007-11-03 07:16:21 -04:00
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
# Create the PLATDIR source directory, if one wasn't distributed..
-$(srcdir)/Lib/$(PLATDIR):
- mkdir $(srcdir)/Lib/$(PLATDIR)
+$(srcdir)/Lib/$(PLATDIR): $(BUILDPYTHON)
+ mkdir -p $(srcdir)/Lib/$(PLATDIR)
cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
export PATH; PATH="`pwd`:$$PATH"; \
export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
Reference in New Issue Copy Permalink