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

Mark USE_AUTOTOOLS deprecated and remove support for libtoolize.

Browse Source 
Approved by:	portmgr (bapt)
This commit is contained in:
Tijl Coosemans 2015-04-19 18:16:40 +00:00
parent bf74b656d1
commit e81a5e63ab
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=384310
3 changed files with 15 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGES
View File

@ -10,6 +10,15 @@ in the release notes and/or placed into UPDATING.
All ports committers are allowed to commit to this file.
20150419:
AUTHOR: tijl@FreeBSD.org
USE_AUTOTOOLS has been deprecated. It can be replaced with USES=autoreconf
and GNU_CONFIGURE=yes.
Support for USE_AUTOTOOLS=libtoolize has been removed. It can be replaced
with "USES=autoreconf libtool".
20150409:
AUTHOR: bapt@FreeBSD.org

49
Mk/bsd.autotools.mk
View File

@ -15,7 +15,6 @@ Autotools_Include_MAINTAINER= autotools@FreeBSD.org
# 'tool' can currently be one of the following:
# autoconf, autoheader
# automake, aclocal
# libtoolize
#
# ':env' is used to specify that the environmental variables are needed
# but the relevant tool should NOT be run as part of the
@ -36,9 +35,6 @@ Autotools_Include_MAINTAINER= autotools@FreeBSD.org
# AUTOHEADER_ARGS=...
# - Extra arguments passed to autoheader during configure step
#
# LIBTOOLIZE_ARGS=...
# - Extra arguments passed to libtoolize during configure step
#
#---------------------------------------------------------------------------
#---------------------------------------------------------------------------
@ -47,8 +43,7 @@ Autotools_Include_MAINTAINER= autotools@FreeBSD.org
# Known autotools components
_AUTOTOOLS_ALL= autoconf autoheader \
automake aclocal \
libtoolize
automake aclocal
#---------------------------------------------------------------------------
# Primary magic to break out the USE_AUTOTOOLS stanza into something
@ -179,37 +174,11 @@ AUTOCONF_DEPENDS= ${AUTOCONF}:${PORTSDIR}/${AUTOCONF_PORT}
BUILD_DEPENDS+= ${AUTOCONF_DEPENDS}
.endif
#---------------------------------------------------------------------------
# libtoolize
#---------------------------------------------------------------------------
.if defined(_AUTOTOOL_libtoolize)
LIBTOOL_VERSION= 2.4
LIBTOOL_PORT= devel/libtool
. if defined(_AUTOTOOL_libtoolize) && ${_AUTOTOOL_libtoolize} == "yes"
_AUTOTOOL_rule_libtoolize= yes
GNU_CONFIGURE?= yes
. endif
.endif
.if defined(LIBTOOL_VERSION)
LIBTOOLIZE= ${LOCALBASE}/bin/libtoolize
LIBTOOL_VARS= LIBTOOLIZE=${LIBTOOLIZE}
LIBTOOLIZE_ARGS?= -i -c -f
LIBTOOL_DEPENDS= libtool>=2.4:${PORTSDIR}/${LIBTOOL_PORT}
BUILD_DEPENDS+= ${LIBTOOL_DEPENDS}
.endif
#---------------------------------------------------------------------------
# Add to the environment
#---------------------------------------------------------------------------
AUTOTOOLS_VARS= ${AUTOMAKE_VARS} ${AUTOCONF_VARS} ${LIBTOOL_VARS}
AUTOTOOLS_VARS= ${AUTOMAKE_VARS} ${AUTOCONF_VARS}
.if defined(AUTOTOOLS_VARS) && !empty(AUTOTOOLS_VARS)
. for var in AUTOTOOLS CONFIGURE MAKE SCRIPTS
@ -222,11 +191,11 @@ ${var:tu}_ENV+= ${AUTOTOOLS_VARS}
#---------------------------------------------------------------------------
.if !target(run-autotools)
.ORDER: run-autotools run-autotools-libtoolize run-autotools-aclocal \
.ORDER: run-autotools run-autotools-aclocal \
run-autotools-autoconf run-autotools-autoheader \
run-autotools-automake
run-autotools:: run-autotools-libtoolize run-autotools-aclocal \
run-autotools:: run-autotools-aclocal \
run-autotools-autoconf run-autotools-autoheader \
run-autotools-automake
.endif
@ -270,13 +239,3 @@ run-autotools-autoheader:
@${DO_NADA}
. endif
.endif
.if !target(run-autotools-libtoolize)
run-autotools-libtoolize:
. if defined(_AUTOTOOL_rule_libtoolize)
@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} \
${LIBTOOLIZE_ARGS})
. else
@${DO_NADA}
. endif
.endif

3
Mk/bsd.sanity.mk
View File

@ -156,8 +156,9 @@ SANITY_UNSUPPORTED= USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
INSTALLS_SHLIB USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \
PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \
USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL
SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX
SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS
USE_AUTOTOOLS_ALT= USES=autoreconf and GNU_CONFIGURE=yes
USE_OPENAL_ALT= USES=openal
USE_FAM_ALT= USES=fam
USE_MAKESELF_ALT= USES=makeself