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

Introduce CONFIGURE_STYLE=autoreconf. 

This runs autoreconf (or a command of your choice, like autogen.sh)
at the gen stage.  It implies "gnu".
ok espie@
This commit is contained in:
naddy 2019-05-14 14:59:56 +00:00
parent 7d7a720b05
commit 1622b80ebb
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.1465 2019/05/12 07:46:35 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.1466 2019/05/14 14:59:56 naddy Exp $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
@ -280,7 +280,7 @@ _ARCH_DEFINES_INCLUDED = Done
. include "${PORTSDIR}/infrastructure/mk/arch-defines.mk"
.endif
.if ${CONFIGURE_STYLE:L:Mautoconf}
.if ${CONFIGURE_STYLE:L:Mautoconf} || ${CONFIGURE_STYLE:L:Mautoreconf}
. if !${CONFIGURE_STYLE:L:Mgnu}
CONFIGURE_STYLE += gnu
. endif

21
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.60 2019/04/04 02:28:06 naddy Exp $
# $OpenBSD: gnu.port.mk,v 1.61 2019/05/14 14:59:56 naddy Exp $
# Based on bsd.port.mk, originally by Jordan K. Hubbard.
# This file is in the public domain.
@ -15,7 +15,19 @@ AUTOCONF_VERSION ?= 2.13
AUTOCONF_ENV = PATH=${PORTPATH} AUTOCONF_VERSION=${AUTOCONF_VERSION} AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
MAKE_ENV += AUTOMAKE_VERSION=${AUTOMAKE_VERSION} AUTOCONF_VERSION=${AUTOCONF_VERSION}
.if ${CONFIGURE_STYLE:L:Mautoconf}
.if ${CONFIGURE_STYLE:L:Mautoreconf} && ${CONFIGURE_STYLE:L:Mautoconf}
ERRORS += "Fatal: Choose either 'autoreconf' or 'autoconf'."
.endif
.if ${CONFIGURE_STYLE:L:Mautoreconf}
BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS}
BUILD_DEPENDS += ${MODGNU_AUTOMAKE_DEPENDS}
BUILD_DEPENDS += devel/libtool
AUTORECONF ?= autoreconf --force --install
AUTOCONF_DIR ?= ${WRKSRC}
# in case autoreconf is replaced by autogen.sh
AUTOCONF_ENV += NOCONFIGURE=1
.elif ${CONFIGURE_STYLE:L:Mautoconf}
BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS}
AUTOCONF ?= autoconf
AUTOHEADER ?= autoheader
@ -108,7 +120,10 @@ _MODGNU_loop =
PATCH_CHECK_ONLY ?= No
.if ${PATCH_CHECK_ONLY:L} != "yes"
. if ${CONFIGURE_STYLE:L:Mautoconf}
. if ${CONFIGURE_STYLE:L:Mautoreconf}
_MODGNU_loop += echo "Running autoreconf-${AUTOCONF_VERSION} in $$d";
_MODGNU_loop += ${SETENV} ${AUTOCONF_ENV} ${AUTORECONF};
. elif ${CONFIGURE_STYLE:L:Mautoconf}
_MODGNU_loop += if test -f $$d/configure; then \
grep -iq 'Generated by.*autoconf.*${AUTOCONF_VERSION}' $$d/configure || { \
echo ">>> Can't find autoconf ${AUTOCONF_VERSION} signature in $$d/configure:"; \