cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Better RUN_DEPENDS for subpackages

Browse Source 
- Use SHARED_LIBS
- Bump PKGNAMEs

spotted by naddy@ and sturm@
SHARED_LIBS tips from espie@
This commit is contained in:
alek 2005-12-27 19:41:21 +00:00
parent 65cd91a8a1
commit 135879e05a
7 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lang/python/2.3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2005/08/27 15:57:31 naddy Exp $
# $OpenBSD: Makefile,v 1.19 2005/12/27 19:41:21 alek Exp $
.if ${MACHINE_ARCH} == "hppa"
BROKEN= "compiler hangs on py-Checker for example"
@ -6,7 +6,8 @@ BROKEN= "compiler hangs on py-Checker for example"
VERSION= 2.3
PATCHLEVEL= .5
PKG_PATCHLEVEL= p2
PKG_PATCHLEVEL= p3
SHARED_LIBS= python2.3 0.0
# needed for www/zope
THREAD_STACK_SIZE= 0x100000

34
lang/python/2.3/patches/patch-Makefile_pre_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_pre_in,v 1.1.1.1 2003/12/31 17:38:33 sturm Exp $
--- Makefile.pre.in.orig 2003-11-18 20:54:00.000000000 +0100
+++ Makefile.pre.in 2003-12-31 17:43:24.000000000 +0100
@@ -305,7 +305,7 @@ all: $(BUILDPYTHON) oldsharedmods share
$OpenBSD: patch-Makefile_pre_in,v 1.2 2005/12/27 19:41:21 alek Exp $
--- Makefile.pre.in.orig Tue Jan 11 14:48:52 2005
+++ Makefile.pre.in Sat Dec 24 11:18:58 2005
@@ -308,7 +308,7 @@ all: $(BUILDPYTHON) oldsharedmods share
$(BUILDPYTHON): Modules/$(MAINOBJ) $(LIBRARY) $(LDLIBRARY)
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
Modules/$(MAINOBJ) \
@ -10,19 +10,19 @@ $OpenBSD: patch-Makefile_pre_in,v 1.1.1.1 2003/12/31 17:38:33 sturm Exp $
platform: $(BUILDPYTHON)
$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
@@ -354,6 +354,11 @@ libpython$(VERSION).so: $(LIBRARY_OBJS)
@@ -357,6 +357,11 @@ libpython$(VERSION).so: $(LIBRARY_OBJS)
libpython$(VERSION).sl: $(LIBRARY_OBJS)
$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM)
+# This rule for OpenBSD...
+libpython$(VERSION).so.$(MAJOR).$(MINOR): $(LIBRARY)
+$(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.
@@ -584,7 +589,6 @@ bininstall: altbininstall
@@ -587,7 +592,6 @@ bininstall: altbininstall
then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
else true; \
fi
@ -30,7 +30,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.1.1.1 2003/12/31 17:38:33 sturm Exp $
# Install the interpreter with $(VERSION) affixed
# This goes into $(exec_prefix)
@@ -595,7 +599,7 @@ altbininstall: $(BUILDPYTHON)
@@ -598,7 +602,7 @@ altbininstall: $(BUILDPYTHON)
exit 1; \
fi; \
fi
@ -39,21 +39,25 @@ $OpenBSD: patch-Makefile_pre_in,v 1.1.1.1 2003/12/31 17:38:33 sturm Exp $
do \
if test ! -d $(DESTDIR)$$i; then \
echo "Creating directory $$i"; \
@@ -604,11 +608,11 @@ altbininstall: $(BUILDPYTHON)
@@ -607,14 +611,12 @@ altbininstall: $(BUILDPYTHON)
fi; \
done
$(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE)
- if test -f libpython$(VERSION)$(SO); then \
+ if test -f libpython$(VERSION)$(SO).$(MAJOR).$(MINOR); 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); \
+ $(INSTALL_SHARED) libpython$(VERSION)$(SO).$(MAJOR).$(MINOR) $(DESTDIR)$(LIBPL)/libpython$(VERSION)$(SO).$(MAJOR).$(MINOR); \
if test libpython$(VERSION)$(SO) != $(INSTSONAME); then \
(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \
fi \
@@ -627,7 +631,7 @@ maninstall:
- 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
@@ -630,7 +632,7 @@ maninstall:
fi; \
done
$(INSTALL_DATA) $(srcdir)/Misc/python.man \

7
lang/python/2.3/pkg/PFRAG.shared
View File

@ -1,8 +1,7 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2004/11/14 11:48:19 espie Exp $
@comment $OpenBSD: PFRAG.shared,v 1.4 2005/12/27 19:41:21 alek Exp $
%%mm%%
@comment lib/libpython2.3.so
@lib lib/libpython2.3.so.0.0
@lib lib/python2.3/config/libpython2.3.so.0.0
@lib lib/libpython2.3.so.${LIBpython2.3_VERSION}
@lib lib/python2.3/config/libpython2.3.so.${LIBpython2.3_VERSION}
lib/python2.3/lib-dynload/
@comment lib/python2.3/lib-dynload/_bsddb.so
lib/python2.3/lib-dynload/_csv.so

5
lang/python/2.4/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.4 2005/12/17 12:33:00 alek Exp $
# $OpenBSD: Makefile,v 1.5 2005/12/27 19:41:21 alek Exp $
VERSION= 2.4
PATCHLEVEL= .2
PKG_PATCHLEVEL=
PKG_PATCHLEVEL= p0
SHARED_LIBS= python2.4 0.0
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "sparc64"
PATCH_LIST= patch-* sup64-*

26
lang/python/2.4/patches/patch-Makefile_pre_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_pre_in,v 1.1.1.1 2005/06/07 01:12:58 alek Exp $
--- Makefile.pre.in.orig Sun Sep 26 19:26:55 2004
+++ Makefile.pre.in Thu Dec 30 22:46:12 2004
$OpenBSD: patch-Makefile_pre_in,v 1.2 2005/12/27 19:41:21 alek Exp $
--- Makefile.pre.in.orig Tue Mar 29 01:23:01 2005
+++ Makefile.pre.in Sat Dec 24 10:36:43 2005
@@ -311,7 +311,7 @@ all: $(BUILDPYTHON) oldsharedmods share
$(BUILDPYTHON): Modules/$(MAINOBJ) $(LIBRARY) $(LDLIBRARY)
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
@ -15,7 +15,7 @@ $OpenBSD: patch-Makefile_pre_in,v 1.1.1.1 2005/06/07 01:12:58 alek Exp $
$(LDSHARED) -o $@ $(LIBRARY_OBJS) $(LIBC) $(LIBM)
+# This rule for OpenBSD...
+libpython$(VERSION).so.$(MAJOR).$(MINOR): $(LIBRARY)
+$(LDLIBRARY): $(LIBRARY)
+ $(LDSHARED) -o $@ $(LIBRARY_OBJS)
+
+
@ -39,21 +39,25 @@ $OpenBSD: patch-Makefile_pre_in,v 1.1.1.1 2005/06/07 01:12:58 alek Exp $
do \
if test ! -d $(DESTDIR)$$i; then \
echo "Creating directory $$i"; \
@@ -616,11 +620,11 @@ altbininstall: $(BUILDPYTHON)
@@ -616,14 +620,12 @@ altbininstall: $(BUILDPYTHON)
fi; \
done
$(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE)
- if test -f libpython$(VERSION)$(SO); then \
+ if test -f libpython$(VERSION)$(SO).$(MAJOR).$(MINOR); 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); \
+ $(INSTALL_SHARED) libpython$(VERSION)$(SO).$(MAJOR).$(MINOR) $(DESTDIR)$(LIBPL)/libpython$(VERSION)$(SO).$(MAJOR).$(MINOR); \
if test libpython$(VERSION)$(SO) != $(INSTSONAME); then \
(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \
fi \
@@ -639,7 +643,7 @@ maninstall:
- 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
@@ -639,7 +641,7 @@ maninstall:
fi; \
done
$(INSTALL_DATA) $(srcdir)/Misc/python.man \

7
lang/python/2.4/pkg/PFRAG.shared
View File

@ -1,8 +1,7 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2005/12/17 12:33:00 alek Exp $
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/27 19:41:21 alek Exp $
%%mm%%
@comment lib/libpython2.4.so
@lib lib/libpython2.4.so.0.0
@lib lib/python2.4/config/libpython2.4.so.0.0
@lib lib/libpython2.4.so.${LIBpython2.4_VERSION}
@lib lib/python2.4/config/libpython2.4.so.${LIBpython2.4_VERSION}
lib/python2.4/lib-dynload/_bisect.so
lib/python2.4/lib-dynload/_codecs_cn.so
lib/python2.4/lib-dynload/_codecs_hk.so

14
lang/python/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.34 2005/12/17 12:45:39 alek Exp $
# $OpenBSD: Makefile.inc,v 1.35 2005/12/27 19:41:21 alek Exp $
# IMPORTANT! If you make any changes to the Python ports, be sure
# to also update files/CHANGES.OpenBSD for your change. This is a
@ -55,7 +55,7 @@ LIB_DEPENDS= bz2::archivers/bzip2
.if defined(PACKAGING)
. if !empty(SUBPACKAGE)
RUN_DEPENDS= :python-${VERSION}${PATCHLEVEL}:lang/python/${VERSION}
RUN_DEPENDS= :python-${VERSION}${PATCHLEVEL}${PKG_PATCHLEVEL}:lang/python/${VERSION}
LIB_DEPENDS=
. else
WANTLIB= ssl curses termcap panel m crypto c util z readline pthread \
@ -199,9 +199,9 @@ CONFIGURE_ENV+= OPT='${CFLAGS}' LDFLAGS='-L${WRKSRC}'
.else
CONFIGURE_ENV+= OPT='${CFLAGS} -DTHREAD_STACK_SIZE=${THREAD_STACK_SIZE} -fPIC' \
LDFLAGS='-L${WRKSRC}'
MAKE_FLAGS+= MAJOR=0 MINOR=0 LDLIBRARY=libpython${VERSION}.so.0.0 \
MAKE_FLAGS+= LDLIBRARY=libpython${VERSION}.so.${LIBpython${VERSION}_VERSION} \
LD_LIBRARY_PATH=${WRKSRC} PATH="${WRKDIST}:${PORTPATH}"
FAKE_FLAGS+= MAJOR=0 MINOR=0 LDLIBRARY=libpython${VERSION}.so.0.0 \
FAKE_FLAGS+= LDLIBRARY=libpython${VERSION}.so.${LIBpython${VERSION}_VERSION} \
LD_LIBRARY_PATH=${WRKSRC} RANLIB=:
.endif
@ -225,12 +225,6 @@ post-install:
${INSTALL_SCRIPT} ${WRKSRC}/idle ${PREFIX}/bin/idle${VERSION}
@cd ${WRKSRC}; tar -cf - Tools | (cd ${PREFIX}/lib/python${VERSION}; \
tar -xf -)
${INSTALL_DATA} ${WRKSRC}/libpython${VERSION}.a \
${PREFIX}/lib/python${VERSION}/config
@if [ -f ${PREFIX}/lib/python${VERSION}/config/libpython${VERSION}.so.0.0 ]; then \
cd ${PREFIX}/lib && ln -s python${VERSION}/config/libpython${VERSION}.so.0.0; \
fi
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/python${VERSION}
${INSTALL_DATA} ${FILESDIR}/CHANGES.OpenBSD \
${PREFIX}/share/doc/python${VERSION}/CHANGES.OpenBSD