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

- add old behaviour back where MODGNU_AUTOMAKE_DEPENDS is always set even

Browse Source 
when not using CONFIGURE_STYLE=automake
this fixes ports depending on a specific version of automake while e.g
using the gnu CONFIGURE_STYLE

ok espie@
This commit is contained in:
ajacoutot 2009-03-14 10:46:56 +00:00
parent 037960749c
commit 21e51b9ca9
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
infrastructure/mk/gnu.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: gnu.port.mk,v 1.35 2009/03/09 23:07:33 espie Exp $
# $OpenBSD: gnu.port.mk,v 1.36 2009/03/14 10:46:56 ajacoutot Exp $
# Based on bsd.port.mk, originally by Jordan K. Hubbard.
# This file is in the public domain.
@ -9,20 +9,21 @@ MODGNU_AUTOCONF_DEPENDS = ::devel/metaauto \
MODGNU_AUTOMAKE_DEPENDS = ::devel/metaauto \
:${_AUTOMAKE_SPEC}:devel/automake/${AUTOMAKE_VERSION}
.if ${CONFIGURE_STYLE:L:Mautomake}
AUTOMAKE_VERSION ?= 1.4
. if ${AUTOMAKE_VERSION} == 1.4
.if ${AUTOMAKE_VERSION} == 1.4
_AUTOMAKE_SPEC = automake->=${AUTOMAKE_VERSION},<1.5
. elif ${AUTOMAKE_VERSION} == 1.8
.elif ${AUTOMAKE_VERSION} == 1.8
_AUTOMAKE_SPEC = automake->=${AUTOMAKE_VERSION},<1.9
. elif ${AUTOMAKE_VERSION} == 1.9
.elif ${AUTOMAKE_VERSION} == 1.9
_AUTOMAKE_SPEC = automake->=${AUTOMAKE_VERSION},<1.10
. endif
.endif
.if ${CONFIGURE_STYLE:L:Mautomake}
BUILD_DEPENDS += ${MODGNU_AUTOMAKE_DEPENDS}
MAKE_ENV += AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
.endif
.if ${CONFIGURE_STYLE:L:Mautoupdate}
. if ${CONFIGURE_STYLE:L:Mautoupdate}
CONFIGURE_STYLE += autoconf
. endif
.endif
.if ${CONFIGURE_STYLE:L:Mautoconf}