Backport a change from 1.5.22 to 1.5.18 that fixes some issues withtv_libtool_1_5_18_tmpdirfix

temp dir creation when using relink-based finalization.

1 files changed, 0 insertions, 162 deletions

diff --git a/mk/texinfo.mk b/mk/texinfo.mk
deleted file mode 100644
index af8bedc8144..00000000000
--- a/mk/texinfo.mk
+++ /dev/null
@@ -1,162 +0,0 @@
-# $NetBSD: texinfo.mk,v 1.28 2005/05/11 02:07:37 jlam Exp $
-#
-# Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Stoned Elipot.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#        This product includes software developed by the NetBSD
-#        Foundation, Inc. and its contributors.
-# 4. Neither the name of The NetBSD Foundation nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# This Makefile fragment is included by bsd.pkg.mk when INFO_FILES is
-# not empty or USE_MAKEINFO is not "no".
-#
-
-.if !defined(TEXINFO_MK)
-TEXINFO_MK=	# defined
-
-.if !empty(INFO_FILES)
-#
-# Handle install-info.
-# 
-
-# Use pkginstall framework i.e. INSTALL/DEINSTALL scripts to handle
-# install-info execution.
-#
-USE_PKGINSTALL=		YES
-
-# Pathname relative to ${PREFIX} of directory holding the info
-# files and the Info dir file.
-INFO_DIR?=	info
-
-# Does the system have the install-info command?
-# Any version will fit (really?).
-_INSTALL_INFO=
-.  for _i_ in /usr/bin/install-info /sbin/install-info
-.    if exists(${_i_}) && (${LOCALBASE} != ${_i_:C|/[^/]+/install-info$||})
-_INSTALL_INFO=			${_i_}
-.    endif
-.  endfor
-
-# If no install-info was found provide one with the pkg_install-info package.
-# And set INSTALL_INFO to the install-info command it provides.
-.  if empty(_INSTALL_INFO)
-_PKG_INSTALL_INFO_PREFIX_DEFAULT=	${LOCALBASE}
-DEPENDS+=	pkg_install-info-[0-9]*:../../pkgtools/pkg_install-info
-EVAL_PREFIX+=	_PKG_INSTALL_INFO_PREFIX=pkg_install-info
-INSTALL_INFO=	${_PKG_INSTALL_INFO_PREFIX}/bin/pkg_install-info
-.  else
-INSTALL_INFO=	${_INSTALL_INFO}
-.  endif
-
-# Generate INSTALL/DEINSTALL scripts code for handling install-info.
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/../../mk/install/install-info
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/../../mk/install/install-info
-FILES_SUBST+=		INFO_FILES=${INFO_FILES:Q}
-FILES_SUBST+=		INSTALL_INFO=${INSTALL_INFO:Q}
-FILES_SUBST+=		INFO_DIR=${INFO_DIR:Q}
-.endif # INFO_FILES
-
-.if empty(USE_MAKEINFO:M[nN][oO])
-#
-# Handle makeinfo.
-#
-
-# Minimum required version for the GNU makeinfo command.
-TEXINFO_REQD?=	3.12
-_TEXINFO_REQD_MAJOR=	${TEXINFO_REQD:C|\..*$||}
-_TEXINFO_REQD_MINOR=	${TEXINFO_REQD:C|^[0-9]+\.||:C|\..*$||}
-
-# Argument to specify maximum info files size for newer versions
-# of makeinfo. This argument is supported since makeinfo 4.1.
-_MAKEINFO_SPLIT_SIZE_ARG+=	--split-size=50000
-
-# The minimum version of makeinfo for which the default info files size
-# was bumped from 50000.
-_MAKEINFO_SPLIT_SIZE_VERSION=	4.6
-
-# Add OPSYS specific flags if any.
-MAKEINFO_ARGS+=         ${_OPSYS_MAKEINFO_ARGS}
-
-# Does the system has a makeinfo command?
-_MAKEINFO=
-.  for _i_ in /usr/bin/makeinfo
-.    if exists(${_i_})
-_MAKEINFO=	${_i_}
-.    endif
-.  endfor
-
-# Record makeinfo's version.
-# If makeinfo's version contains useful information outside the first
-# two dot separated numbers the following would have to be changed as well
-# as _{MAKEINFO,TEXINFO_REQD}_{MAJOR,MINOR} and their comparison below.
-.  if !empty(_MAKEINFO) && !defined(MAKEINFO_VERSION)
-MAKEINFO_VERSION_OUTPUT!=	${_MAKEINFO} --version 2>/dev/null || ${ECHO}
-MAKEINFO_VERSION=
-.    for _i_ in ${MAKEINFO_VERSION_OUTPUT:M[0-9]*.[0-9]*:C/[^0-9.]//}
-.       if empty(MAKEINFO_VERSION)
-MAKEINFO_VERSION=	${_i_}
-.       endif
-.    endfor
-MAKEFLAGS+=			MAKEINFO_VERSION=${MAKEINFO_VERSION}
-.  endif
-
-# Sort out if the version provided by devel/gtexinfo is needed.
-# If it is add it as build time dependency and set MAKEINFO
-# to the makeinfo it provides.
-# Here it is assumed devel/gtexinfo's makeinfo version will be
-# superior or equal to TEXINFO_REQD.
-_NEED_TEXINFO=		YES
-.  if defined(MAKEINFO_VERSION)
-_MAKEINFO_VERSION_MAJOR=	${MAKEINFO_VERSION:C|\..*$||}
-_MAKEINFO_VERSION_MINOR=	${MAKEINFO_VERSION:C|^[0-9]+\.||:C|\..*$||}
-.    if ${_MAKEINFO_VERSION_MAJOR} > ${_TEXINFO_REQD_MAJOR}
-_NEED_TEXINFO=		NO
-.    elif ${_MAKEINFO_VERSION_MAJOR} == ${_TEXINFO_REQD_MAJOR} && ${_MAKEINFO_VERSION_MINOR} >= ${_TEXINFO_REQD_MINOR}
-_NEED_TEXINFO=		NO
-.    endif
-.  endif
-.  if !empty(_NEED_TEXINFO:M[yY][eE][sS])
-BUILD_DEPENDS+=		gtexinfo>=${TEXINFO_REQD}:../../devel/gtexinfo
-_GTEXINFO_PREFIX_DEFAULT=	${LOCALBASE}
-EVAL_PREFIX+=		_GTEXINFO_PREFIX=gtexinfo
-# assume devel/gtexinfo version is >= ${_MAKEINFO_SPLIT_SIZE_VERSION}
-MAKEINFO_ARGS+=		${_MAKEINFO_SPLIT_SIZE_ARG}
-MAKEINFO=		${_GTEXINFO_PREFIX}/bin/makeinfo ${MAKEINFO_ARGS}
-.  else
-.    if defined(MAKEINFO_VERSION) && ${MAKEINFO_VERSION} >= ${_MAKEINFO_SPLIT_SIZE_VERSION}
-MAKEINFO_ARGS+=		${_MAKEINFO_SPLIT_SIZE_ARG}
-.    endif
-MAKEINFO=		${_MAKEINFO} ${MAKEINFO_ARGS}
-.  endif
-.endif # USE_MAKEINFO
-
-.endif # TEXINFO_MK