From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BED3215802F for ; Sat, 1 Apr 2023 12:19:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3EDFE0878; Sat, 1 Apr 2023 12:19:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 679B9E0878 for ; Sat, 1 Apr 2023 12:19:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 842DF340FC7 for ; Sat, 1 Apr 2023 12:19:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8D7639 for ; Sat, 1 Apr 2023 12:19:27 +0000 (UTC) From: "Zhang Zheng" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zhang Zheng" Message-ID: <1680351422.d89a8254dcf65a1b948e39ed5ee36b35db37ba48.zhangzheng.dylan@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-util/xmake/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-util/xmake/Manifest dev-util/xmake/xmake-2.7.1.ebuild dev-util/xmake/xmake-2.7.7.ebuild dev-util/xmake/xmake-9999.ebuild X-VCS-Directories: dev-util/xmake/ X-VCS-Committer: zhangzheng.dylan X-VCS-Committer-Name: Zhang Zheng X-VCS-Revision: d89a8254dcf65a1b948e39ed5ee36b35db37ba48 X-VCS-Branch: dev Date: Sat, 1 Apr 2023 12:19:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 90f9e041-dc78-434e-9cea-bd3656414fec X-Archives-Hash: 468062d1c3a33ae9e362edf0404a9f28 commit: d89a8254dcf65a1b948e39ed5ee36b35db37ba48 Author: Big Pineapple foxmail com> AuthorDate: Sat Apr 1 12:17:02 2023 +0000 Commit: Zhang Zheng foxmail com> CommitDate: Sat Apr 1 12:17:02 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d89a8254 dev-util/xmake: add 2.7.7, drop 2.7.1; fix src_configure Signed-off-by: Big Pineapple foxmail.com> dev-util/xmake/Manifest | 2 +- .../xmake/{xmake-2.7.1.ebuild => xmake-2.7.7.ebuild} | 17 ++++++----------- dev-util/xmake/xmake-9999.ebuild | 17 ++++++----------- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/dev-util/xmake/Manifest b/dev-util/xmake/Manifest index 1aba9b603..0248d8c13 100644 --- a/dev-util/xmake/Manifest +++ b/dev-util/xmake/Manifest @@ -1 +1 @@ -DIST xmake-v2.7.1.tar.gz 4344324 BLAKE2B 6baec6724f4489f0abe25a5925f87fd952fd59645696014ffe23d33df98e838c7ef53fc948ca4d17feed6063da532fa2a59c691dd76305840f476e5e8f3407bb SHA512 499d1d4ac53b8189d8f68706b45981dd9a3c62018000291616a281b944fedb9d5802502dd9edfb7bc0ee5f0456b839f9f2605d536543994bdfb72d178024742e +DIST xmake-v2.7.7.tar.gz 2719137 BLAKE2B c3aca5c538292d2ee002785c5a4bb82ff4ea6d67d07d00f055f35c46caeec8ecd3134e05f9bba6d4e7db5cda725b474fcf70d3b91a4be03b2859c542fa0c0f83 SHA512 449c6ce318076a9473084ae197b0d333e0b4b0f2d7bffe9e3c725ddf7aef3c7d888e9d063e033a7a7d9f690e0e49925e45bc7910f5076b790344f8bdbde0fb15 diff --git a/dev-util/xmake/xmake-2.7.1.ebuild b/dev-util/xmake/xmake-2.7.7.ebuild similarity index 80% rename from dev-util/xmake/xmake-2.7.1.ebuild rename to dev-util/xmake/xmake-2.7.7.ebuild index 9ecfbcf50..e02d4fa7a 100644 --- a/dev-util/xmake/xmake-2.7.1.ebuild +++ b/dev-util/xmake/xmake-2.7.7.ebuild @@ -14,12 +14,10 @@ if [[ ${PV} == *9999* ]]; then else SRC_URI="https://github.com/xmake-io/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz" KEYWORDS="~amd64 ~riscv ~x86" - # extraction path may change in future - S="${WORKDIR}" fi # tarball doesn't provide tests -RESTRICT="test" +RESTRICT="test strip" LICENSE="Apache-2.0" SLOT="0" @@ -40,14 +38,11 @@ DOCS=( NOTICE.md README.md README_zh.md ) -src_compile() { - emake build -} - -src_install() { - einstalldocs - - emake PREFIX="/usr" DESTDIR="${D}" install +src_configure(){ + econf --prefix="${EPREFIX}"/usr \ + --plat=linux + # --plat=linux is necessary, which enables correct directory: + # build/linux/ARCH other than build/ARCH/ARCH } pkg_postinst() { diff --git a/dev-util/xmake/xmake-9999.ebuild b/dev-util/xmake/xmake-9999.ebuild index 9ecfbcf50..e02d4fa7a 100644 --- a/dev-util/xmake/xmake-9999.ebuild +++ b/dev-util/xmake/xmake-9999.ebuild @@ -14,12 +14,10 @@ if [[ ${PV} == *9999* ]]; then else SRC_URI="https://github.com/xmake-io/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz" KEYWORDS="~amd64 ~riscv ~x86" - # extraction path may change in future - S="${WORKDIR}" fi # tarball doesn't provide tests -RESTRICT="test" +RESTRICT="test strip" LICENSE="Apache-2.0" SLOT="0" @@ -40,14 +38,11 @@ DOCS=( NOTICE.md README.md README_zh.md ) -src_compile() { - emake build -} - -src_install() { - einstalldocs - - emake PREFIX="/usr" DESTDIR="${D}" install +src_configure(){ + econf --prefix="${EPREFIX}"/usr \ + --plat=linux + # --plat=linux is necessary, which enables correct directory: + # build/linux/ARCH other than build/ARCH/ARCH } pkg_postinst() {