From owner-freebsd-ports Thu Jan 31 10: 0:28 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3F65537B402 for ; Thu, 31 Jan 2002 10:00:04 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g0VI04p31524; Thu, 31 Jan 2002 10:00:04 -0800 (PST) (envelope-from gnats) Date: Thu, 31 Jan 2002 10:00:04 -0800 (PST) Message-Id: <200201311800.g0VI04p31524@freefall.freebsd.org> To: freebsd-ports@FreeBSD.org Cc: From: "Scot W. Hetzel" Subject: Re: ports/34459: Dumping config.log on configure error is unintuitive. Reply-To: "Scot W. Hetzel" Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org The following reply was made to PR ports/34459; it has been noted by GNATS. From: "Scot W. Hetzel" To: freebsd-gnats-submit@FreeBSD.org Cc: Subject: Re: ports/34459: Dumping config.log on configure error is unintuitive. Date: Thu, 31 Jan 2002 11:54:43 -0600 (CST) Ignore the previous patches, as they were missing a "}" to CONFIG_DEBUG_TMP. I have also added a code that will change the auto[conf|make] programs in the configure script to the correct versions. This is needed as I have noticed that sometimes both autoconf* are run (i.e ${AUTOCONF} by bsd.port.mk, and autoconf by the src distibutions Makefile). Scot Index: bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.397 diff -u -r1.397 bsd.port.mk --- bsd.port.mk 24 Jan 2002 01:15:03 -0000 1.397 +++ bsd.port.mk 31 Jan 2002 16:32:34 -0000 @@ -513,6 +513,7 @@ # to turn them off (default: ${ECHO}). # PATCH_DEBUG - If set, print out more information about the patches as # it attempts to apply them. +# CONFIG_DEBUG - If set, print out more information about the configure process. # PKG_DBDIR - Where package installation is recorded (default: /var/db/pkg) # NO_PKG_REGISTER - Don't register a port installation as a package. # FORCE_PKG_REGISTER - If set, it will overwrite any existing package @@ -1112,6 +1113,12 @@ PATCH_DIST_ARGS+= -C .endif +.if defined(CONFIG_DEBUG) +CONFIG_DEBUG_TMP= yes +.else +CONFIG_DEBUG_TMP= no +.endif + .if exists(/bin/tar) TAR?= /bin/tar .else @@ -2197,6 +2204,9 @@ fi .if defined(HAS_CONFIGURE) @(cd ${CONFIGURE_WRKSRC} && \ + ${PERL} -pi -e "s/aclocal/${ACLOCAL}/g; s/automake/${AUTOMAKE}/g; \ + s/autoconf/${AUTOCONF}/g; s/autoheader/${AUTOHEADER}/g;" \ + ${CONFIGURE_SCRIPT} ; \ if ! ${SETENV} CC="${CC}" CXX="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \ @@ -2204,9 +2214,13 @@ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \ - ${ECHO} "===> Script \"${CONFIGURE_SCRIPT}\" failed: here are the contents of \"${CONFIGURE_LOG}\""; \ - ${CAT} ${CONFIGURE_LOG}; \ - ${ECHO} "(end of \"${CONFIGURE_LOG}\")"; \ + if [ ${CONFIG_DEBUG_TMP} = yes ]; then \ + ${ECHO} "===> Script \"${CONFIGURE_SCRIPT}\" failed: here are the contents of \"${CONFIGURE_LOG}\""; \ + ${CAT} ${CONFIGURE_LOG}; \ + ${ECHO} "(end of \"${CONFIGURE_LOG}\")"; \ + else \ + ${ECHO} "===> Script \"${CONFIGURE_SCRIPT}\" failed: review ${CONFIGURE_WRKSRC}/${CONFIGURE_LOG} for problem" ; \ + fi ; \ ${FALSE}; \ fi) .endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message