deal with python,-expat on no shared libs archs..

This commit is contained in:
xsa 2004-08-06 07:35:11 +00:00
parent 081857cde9
commit 4474ad8f8b
2 changed files with 8 additions and 17 deletions

View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.18 2004/08/03 10:16:36 xsa Exp $
# $OpenBSD: Makefile,v 1.19 2004/08/06 07:35:11 xsa Exp $
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
SHARED_ONLY= Yes
COMMENT= "object-oriented web application server"
@ -26,8 +26,11 @@ PYTHON_VER= 2.3
PYTHON_BIN= ${LOCALBASE}/bin/python${PYTHON_VER}
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= ::lang/python/${PYTHON_VER} \
::lang/python/${PYTHON_VER},-expat
RUN_DEPENDS= ::lang/python/${PYTHON_VER}
.if !defined(NO_SHARED_LIBS) || ${NO_SHARED_LIBS:U} != YES
RUN_DEPENDS+= ::lang/python/${PYTHON_VER},-expat
.endif
CONFIGURE_STYLE=simple
CONFIGURE_ARGS= --with-python=${LOCALBASE}/bin/python${PYTHON_VER} \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2004/08/03 10:16:37 xsa Exp $
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/06 07:35:11 xsa Exp $
lib/zope/lib/python/AccessControl/cAccessControl.so
lib/zope/lib/python/Acquisition.so
lib/zope/lib/python/BDBStorage/_helper.so
@ -33,15 +33,3 @@ lib/zope/lib/python/ZODB/coptimizations.so
lib/zope/lib/python/ZODB/winlock.so
lib/zope/lib/python/initgroups.so
lib/zope/lib/python/intSet.so
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/AccessControl)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/BDBStorage)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/BTrees)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/DocumentTemplate)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/Products/PluginIndexes/TextIndex/Splitter/ISO_8859_1_Splitter)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/Products/PluginIndexes/TextIndex/Splitter/UnicodeSplitter)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/Products/ZCTextIndex)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/SearchIndex)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/Shared/DC/xml/pyexpat)
@comment NEWDYNLIBDIR(%D/lib/zope/lib/python/ZODB)