Received: by mail.netbsd.org (Postfix, from userid 605) id 9AFBA84D74; Sun, 2 Dec 2018 14:32:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B19A784D6C for ; Sun, 2 Dec 2018 14:32:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id bCpYmqdqGEFj for ; Sun, 2 Dec 2018 14:32:18 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id C48A484CD6 for ; Sun, 2 Dec 2018 14:32:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id BC0E1F996; Sun, 2 Dec 2018 14:32:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1543761137237270" MIME-Version: 1.0 Date: Sun, 2 Dec 2018 14:32:17 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20181202143217.BC0E1F996@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1543761137237270 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sun Dec 2 14:32:17 UTC 2018 Modified Files: pkgsrc/devel/boost-headers: Makefile pkgsrc/meta-pkgs/boost: Makefile.common Log Message: boost-headers: do not generate user.hpp during configure. Use the pregenerated file instead. The configure step is only intended to be used as a base when porting to new platforms, and as-is it didn't use the same flags that were used in other places. See https://github.com/boostorg/config/issues/240 for more details. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 pkgsrc/devel/boost-headers/Makefile cvs rdiff -u -r1.78 -r1.79 pkgsrc/meta-pkgs/boost/Makefile.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1543761137237270 Content-Disposition: inline Content-Length: 2561 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/boost-headers/Makefile diff -u pkgsrc/devel/boost-headers/Makefile:1.51 pkgsrc/devel/boost-headers/Makefile:1.52 --- pkgsrc/devel/boost-headers/Makefile:1.51 Thu Aug 16 15:58:32 2018 +++ pkgsrc/devel/boost-headers/Makefile Sun Dec 2 14:32:17 2018 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.51 2018/08/16 15:58:32 adam Exp $ +# $NetBSD: Makefile,v 1.52 2018/12/02 14:32:17 wiz Exp $ BOOST_PACKAGE= headers BOOST_COMMENT= (build-time headers) BOOST_CONFIG= generate +PKGREVISION= 1 .include "../../meta-pkgs/boost/Makefile.common" Index: pkgsrc/meta-pkgs/boost/Makefile.common diff -u pkgsrc/meta-pkgs/boost/Makefile.common:1.78 pkgsrc/meta-pkgs/boost/Makefile.common:1.79 --- pkgsrc/meta-pkgs/boost/Makefile.common:1.78 Fri Sep 7 10:03:45 2018 +++ pkgsrc/meta-pkgs/boost/Makefile.common Sun Dec 2 14:32:17 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.78 2018/09/07 10:03:45 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.79 2018/12/02 14:32:17 wiz Exp $ # # used by devel/boost-build/Makefile # used by devel/boost-docs/Makefile @@ -91,20 +91,23 @@ post-wrapper: pre-configure: ${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${TOUCH} -# Generate a new user.hpp or use the installed one, depending on the package -# we are building. -. if ${BOOST_CONFIG} == "installed" -. include "../../devel/boost-headers/buildlink3.mk" -do-configure: - ${CP} -f \ - ${BUILDLINK_PREFIX.boost-headers}/include/boost/config/user.hpp \ - ${WRKSRC}/boost/config/user.hpp -. elif ${BOOST_CONFIG} == "generate" -do-configure: - cd ${WRKSRC}/libs/config && \ - ${SETENV} ${CONFIGURE_ENV} ${SH} ./configure - ${CP} -f ${WRKSRC}/libs/config/user.hpp ${WRKSRC}/boost/config/user.hpp -. endif +# According to https://github.com/boostorg/config/issues/240 +# the user.hpp generation is intended only for porting to new platforms +# and we should use the provided one. +## Generate a new user.hpp or use the installed one, depending on the package +## we are building. +#. if ${BOOST_CONFIG} == "installed" +#. include "../../devel/boost-headers/buildlink3.mk" +#do-configure: +# ${CP} -f \ +# ${BUILDLINK_PREFIX.boost-headers}/include/boost/config/user.hpp \ +# ${WRKSRC}/boost/config/user.hpp +#. elif ${BOOST_CONFIG} == "generate" +#do-configure: +# cd ${WRKSRC}/libs/config && \ +# ${SETENV} ${CONFIGURE_ENV} ${SH} ./configure +# ${CP} -f ${WRKSRC}/libs/config/user.hpp ${WRKSRC}/boost/config/user.hpp +#. endif boost-install-libs: ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib --_----------=_1543761137237270--