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

fix build: prevent infinite recursion thru python.

Browse Source 
also annotate gamin for bootstrap property, and mark haddock,no_deps as
a "real flavor", since it's only used for bootstrap anyways AND significantly
changes the build.
This commit is contained in:
espie 2011-10-18 06:46:24 +00:00
parent af01b50822
commit 56902f8f20
5 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/db/v4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.55 2011/10/17 10:10:59 espie Exp $ # $OpenBSD: Makefile,v 1.56 2011/10/18 06:46:24 espie Exp $
COMMENT-java= Java bindings for Berkeley DB, revision ${REV} COMMENT-java= Java bindings for Berkeley DB, revision ${REV}
@ -36,7 +36,7 @@ CONFIGURE_STYLE=gnu
DEST_SUBDIR= ${REV} DEST_SUBDIR= ${REV}
WANTLIB= c m stdc++ WANTLIB= c m stdc++
PSEUDO_FLAVORS= no_java PSEUDO_FLAVORS= no_java bootstrap
FLAVOR?= FLAVOR?=
MULTI_PACKAGES = -java MULTI_PACKAGES = -java

4
devel/glib2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.140 2011/10/14 15:25:40 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.141 2011/10/18 06:46:24 espie Exp $
COMMENT-main= general-purpose utility library COMMENT-main= general-purpose utility library
COMMENT-docs= glib2 documentation COMMENT-docs= glib2 documentation
@ -43,7 +43,7 @@ WANTLIB-main += ${WANTLIB} c pthread z pcre fam ffi
LIB_DEPENDS-main= ${LIB_DEPENDS} \ LIB_DEPENDS-main= ${LIB_DEPENDS} \
devel/pcre>=8.13 \ devel/pcre>=8.13 \
sysutils/gamin,no_server,no_python \ sysutils/gamin,no_server,no_python,bootstrap \
devel/libffi devel/libffi
PKG_ARCH-docs= * PKG_ARCH-docs= *

8
devel/haddock/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.33 2011/09/16 09:24:50 espie Exp $ # $OpenBSD: Makefile,v 1.34 2011/10/18 06:46:24 espie Exp $
COMMENT-main = documentation-generation tool for Haskell libraries COMMENT-main = documentation-generation tool for Haskell libraries
COMMENT-lib = haddock library COMMENT-lib = haddock library
@ -20,13 +20,13 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes PERMIT_DISTFILES_FTP = Yes
# This pseudo flavor is needed to let ghc extract the haddock sources # This flavor is needed to let ghc extract the haddock sources
# without pulling in haddocks own build dependencies (which would # without pulling in haddocks own build dependencies (which would
# include ghc). # include ghc).
PSEUDO_FLAVORS = no_deps FLAVORS = no_deps
FLAVOR ?= FLAVOR ?=
.if ! ${FLAVOR:L:Mno_deps} .if ! ${FLAVOR:Mno_deps}
MODULES = lang/ghc converters/libiconv MODULES = lang/ghc converters/libiconv
MODGHC_BUILD = cabal hackage register MODGHC_BUILD = cabal hackage register

12
lang/python/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.85 2011/09/28 16:59:33 fgsch Exp $ # $OpenBSD: Makefile.inc,v 1.86 2011/10/18 06:46:24 espie Exp $
# IMPORTANT! If you make any changes to the Python ports, be sure # IMPORTANT! If you make any changes to the Python ports, be sure
# to also update files/CHANGES.OpenBSD for your change. This is a # to also update files/CHANGES.OpenBSD for your change. This is a
@ -76,8 +76,14 @@ LIB_DEPENDS-main += databases/sqlite3
WANTLIB-main += sqlite3 WANTLIB-main += sqlite3
.endif .endif
LIB_DEPENDS-bsddb = databases/db/v4 \ LIB_DEPENDS-bsddb = lang/python/${VERSION},-main
lang/python/${VERSION},-main .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
# XXX recursion: if we have java, then db/v4 depends on libxml
LIB_DEPENDS-bsddb += databases/db/v4,no_tcl,no_java,bootstrap
.else
LIB_DEPENDS-bsddb += databases/db/v4
.endif
WANTLIB-bsddb = lib/db4/db>=4 python${VERSION}${LIB_SUFX} WANTLIB-bsddb = lib/db4/db>=4 python${VERSION}${LIB_SUFX}
LIB_DEPENDS-gdbm = databases/gdbm \ LIB_DEPENDS-gdbm = databases/gdbm \
lang/python/${VERSION},-main lang/python/${VERSION},-main

4
sysutils/gamin/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.30 2011/10/04 07:09:47 espie Exp $ # $OpenBSD: Makefile,v 1.31 2011/10/18 06:46:24 espie Exp $
# XXX fix building with glib2 >= 2.29 (G_CONST_RETURN is deprecated) # XXX fix building with glib2 >= 2.29 (G_CONST_RETURN is deprecated)
CFLAGS += "-DG_CONST_RETURN=const" CFLAGS += "-DG_CONST_RETURN=const"
@ -39,7 +39,7 @@ EXTRACT_SUFX= .tar.bz2
MULTI_PACKAGES= -main -server -python MULTI_PACKAGES= -main -server -python
NOT_FOR_ARCHS-python = ${NO_SHARED_ARCHS} NOT_FOR_ARCHS-python = ${NO_SHARED_ARCHS}
PSEUDO_FLAVORS= no_python no_server PSEUDO_FLAVORS= no_python no_server bootstrap
FLAVOR?= FLAVOR?=
MODULES= x11/gnome MODULES= x11/gnome