From owner-svn-ports-all@freebsd.org Sun Dec 1 08:43:44 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C1BFC1C4053; Sun, 1 Dec 2019 08:43:44 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47Qhc04Tkgz4bhg; Sun, 1 Dec 2019 08:43:44 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7D51CC461; Sun, 1 Dec 2019 08:43:44 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB18hiVc097379; Sun, 1 Dec 2019 08:43:44 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB18hhfu097377; Sun, 1 Dec 2019 08:43:43 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201912010843.xB18hhfu097377@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 1 Dec 2019 08:43:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518760 - in head: Mk/Uses games/jaggedalliance2 x11/squeekboard X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head: Mk/Uses games/jaggedalliance2 x11/squeekboard X-SVN-Commit-Revision: 518760 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Dec 2019 08:43:44 -0000 Author: tobik Date: Sun Dec 1 08:43:43 2019 New Revision: 518760 URL: https://svnweb.freebsd.org/changeset/ports/518760 Log: Mk/Uses/cargo.mk: Do not override do-configure Cargo vendoring can be useful even for ports that use other build systems like Meson to call Cargo for the actual build. Often they use the framework's default do-configure which USES=cargo should not overwrite. Remove hacks from games/jaggedalliance2 and x11/squeekboard. Reviewed by: jbeich Differential Revision: https://reviews.freebsd.org/D22619 Modified: head/Mk/Uses/cargo.mk head/games/jaggedalliance2/Makefile head/x11/squeekboard/Makefile Modified: head/Mk/Uses/cargo.mk ============================================================================== --- head/Mk/Uses/cargo.mk Sun Dec 1 08:36:19 2019 (r518759) +++ head/Mk/Uses/cargo.mk Sun Dec 1 08:43:43 2019 (r518760) @@ -241,10 +241,12 @@ cargo-patch-git: ${SED} -i.dist -E ${_CARGO_GIT_PATCH_CARGOTOML} {} + .endif -.if !target(do-configure) && ${CARGO_CONFIGURE:tl} == "yes" +.if ${CARGO_CONFIGURE:tl} == "yes" +_USES_configure+= 250:cargo-configure + # configure hook. Place a config file for overriding crates-io index # by local source directory. -do-configure: +cargo-configure: @${MKDIR} ${WRKDIR}/.cargo @${ECHO_CMD} "[source.cargo]" > ${WRKDIR}/.cargo/config @${ECHO_CMD} "directory = '${CARGO_VENDOR_DIR}'" >> ${WRKDIR}/.cargo/config Modified: head/games/jaggedalliance2/Makefile ============================================================================== --- head/games/jaggedalliance2/Makefile Sun Dec 1 08:36:19 2019 (r518759) +++ head/games/jaggedalliance2/Makefile Sun Dec 1 08:43:43 2019 (r518760) @@ -80,11 +80,6 @@ post-patch: @${REINPLACE_CMD} -e 's|/some/place/where/the/data/is|${DATADIR}|' \ ${WRKSRC}/rust/src/stracciatella.rs -post-configure: - @${MKDIR} ${CONFIGURE_WRKSRC} - @cd ${CONFIGURE_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \ - ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} - post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ja2 \ ${STAGEDIR}${PREFIX}/bin/ja2-launcher \ Modified: head/x11/squeekboard/Makefile ============================================================================== --- head/x11/squeekboard/Makefile Sun Dec 1 08:36:19 2019 (r518759) +++ head/x11/squeekboard/Makefile Sun Dec 1 08:43:43 2019 (r518760) @@ -74,6 +74,9 @@ CARGO_CRATES= aho-corasick-0.7.6 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ xkbcommon-0.4.0 \ yaml-rust-0.4.3 +CARGO_BUILD= no +CARGO_INSTALL= no +CARGO_TEST= no post-patch: # Pass USES=cargo environment to USES=meson @@ -84,18 +87,5 @@ post-patch: s,"$$@","$$cmd" --verbose &,; }' \ -e '/OUT_PATH=/s,=.*,=$$PWD/$$1,' \ ${WRKSRC}/cargo*.sh - -post-configure: -# Run USES=meson after USES=cargo configures vendoring - @(cd ${CONFIGURE_WRKSRC} && ${SETENV} \ - ${MAKE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}) - -# Let USES=meson handle the rest -do-build: - @${DO_MAKE_BUILD} -C${BUILD_WRKSRC} ${ALL_TARGET} -do-install: - @${DO_MAKE_BUILD} -C${INSTALL_WRKSRC} ${INSTALL_TARGET} -do-test: - @${DO_MAKE_BUILD} -C${TEST_WRKSRC} ${TEST_TARGET} .include