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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1792C15808C for ; Fri, 15 Apr 2022 18:42:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 040E3E0959; Fri, 15 Apr 2022 18:42:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 0978DE0908 for ; Fri, 15 Apr 2022 18:42:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 DD36A341E13 for ; Fri, 15 Apr 2022 18:42:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4EB433A7 for ; Fri, 15 Apr 2022 18:42:00 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1649980429.fba7fc2a759942fe61da56f07e12b695d2bf6c17.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: www-apps/code-server-bin/ X-VCS-Repository: repo/proj/guru X-VCS-Files: www-apps/code-server-bin/code-server-bin-4.1.0.ebuild X-VCS-Directories: www-apps/code-server-bin/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: fba7fc2a759942fe61da56f07e12b695d2bf6c17 X-VCS-Branch: master Date: Fri, 15 Apr 2022 18:42:00 +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: 19ca24e6-c3fd-460e-b7d2-850909461021 X-Archives-Hash: 3d78729a10d651954bc8fe7ab0ca0f5d commit: fba7fc2a759942fe61da56f07e12b695d2bf6c17 Author: Leonardo Hernández Hernández outlook com> AuthorDate: Thu Apr 14 23:30:47 2022 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Thu Apr 14 23:53:49 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fba7fc2a www-apps/code-server-bin: fix CFLAGS/LDFLAGS QA notice Closes: https://bugs.gentoo.org/834755 Closes: https://bugs.gentoo.org/834756 Signed-off-by: Leonardo Hernández Hernández outlook.com> .../code-server-bin/code-server-bin-4.1.0.ebuild | 64 ++++++++++++---------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/www-apps/code-server-bin/code-server-bin-4.1.0.ebuild b/www-apps/code-server-bin/code-server-bin-4.1.0.ebuild index ae11684ad..36b720788 100644 --- a/www-apps/code-server-bin/code-server-bin-4.1.0.ebuild +++ b/www-apps/code-server-bin/code-server-bin-4.1.0.ebuild @@ -28,7 +28,7 @@ IUSE="gnome-keyring" RDEPEND=" ${DEPEND} - >=net-libs/nodejs-14.0[ssl] + >=net-libs/nodejs-14[ssl] sys-apps/ripgrep gnome-keyring? ( app-crypt/libsecret @@ -41,29 +41,37 @@ PATCHES=( "${FILESDIR}/${PN}-node.patch" ) DOCS=( "README.md" "ThirdPartyNotices.txt" ) +# Relative to parent +CODE_OSS_MODULES="vendor/modules/code-oss-dev/node_modules" + QA_PREBUILT=" - /opt/code-server-bin/lib/coder-cloud-agent - /opt/code-server-bin/node_modules/@node-rs/argon2-linux-x64-musl/argon2.linux-x64-musl.node - /opt/code-server-bin/node_modules/@node-rs/argon2-linux-x64-gnu/argon2.linux-x64-gnu.node - /opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/native-is-elevated/build/Release/obj.target/iselevated.node - /opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/native-is-elevated/build/Release/iselevated.node - /opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/node-pty/build/Release/pty.node - /opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/native-watchdog/build/Release/obj.target/watchdog.node - /opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/native-watchdog/build/Release/watchdog.node - /opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node - /opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/@parcel/watcher/prebuilds/linux-x64/node.napi.glibc.node - /opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/spdlog/build/Release/obj.target/spdlog.node - /opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/spdlog/build/Release/spdlog.node - /opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/vscode-nsfw/build/Release/obj.target/nsfw.node - /opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/vscode-nsfw/build/Release/nsfw.node - /opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/@vscode/sqlite3/build/Release/obj.target/sqlite.node - /opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/@vscode/sqlite3/build/Release/sqlite.node + /opt/${PN}/lib/coder-cloud-agent + /opt/${PN}/node_modules/argon2/lib/binding/napi-v3/argon2.node + /opt/${PN}/node_modules/argon2/build-tmp-napi-v3/Release/argon2.node + /opt/${PN}/node_modules/argon2/build-tmp-napi-v3/Release/obj.target/argon2.node + /opt/${PN}/node_modules/@node-rs/argon2-linux-x64-musl/argon2.linux-x64-musl.node + /opt/${PN}/node_modules/@node-rs/argon2-linux-x64-gnu/argon2.linux-x64-gnu.node + /opt/${PN}/${CODE_OSS_MODULES}/native-is-elevated/build/Release/obj.target/iselevated.node + /opt/${PN}/${CODE_OSS_MODULES}/native-is-elevated/build/Release/iselevated.node + /opt/${PN}/${CODE_OSS_MODULES}/node-pty/build/Release/pty.node + /opt/${PN}/${CODE_OSS_MODULES}/native-watchdog/build/Release/obj.target/watchdog.node + /opt/${PN}/${CODE_OSS_MODULES}/native-watchdog/build/Release/watchdog.node + /opt/${PN}/${CODE_OSS_MODULES}/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node + /opt/${PN}/${CODE_OSS_MODULES}/@parcel/watcher/prebuilds/linux-x64/node.napi.glibc.node + /opt/${PN}/${CODE_OSS_MODULES}/spdlog/build/Release/obj.target/spdlog.node + /opt/${PN}/${CODE_OSS_MODULES}/spdlog/build/Release/spdlog.node + /opt/${PN}/${CODE_OSS_MODULES}/vscode-nsfw/build/Release/obj.target/nsfw.node + /opt/${PN}/${CODE_OSS_MODULES}/vscode-nsfw/build/Release/nsfw.node + /opt/${PN}/${CODE_OSS_MODULES}/@vscode/sqlite3/build/Release/obj.target/sqlite.node + /opt/${PN}/${CODE_OSS_MODULES}/@vscode/sqlite3/build/Release/sqlite.node + /opt/${PN}/${CODE_OSS_MODULES}/@parcel/watcher/build/Release/watcher.node + /opt/${PN}/${CODE_OSS_MODULES}/@parcel/watcher/build/Release/obj.target/watcher.node " QA_PRESTRIPPED=" - /opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node - /opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/@parcel/watcher/prebuilds/linux-x64/node.napi.glibc.node - /opt/code-server-bin/node_modules/@node-rs/argon2-linux-x64-musl/argon2.linux-x64-musl.node + /opt/${PN}/node_modules/@node-rs/argon2-linux-x64-musl/argon2.linux-x64-musl.node + /opt/${PN}/${CODE_OSS_MODULES}/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node + /opt/${PN}/${CODE_OSS_MODULES}/@parcel/watcher/prebuilds/linux-x64/node.napi.glibc.node " src_prepare() { @@ -78,7 +86,7 @@ src_prepare() { || die "Failed to remove bundled nodejs" # remove bundled ripgrep binary - rm ./vendor/modules/code-oss-dev/node_modules/vscode-ripgrep/bin/rg \ + rm ./"${CODE_OSS_MODULES}"/vscode-ripgrep/bin/rg \ || die "Failed to remove bundled ripgrep" # not needed @@ -89,19 +97,19 @@ src_prepare() { rm ./LICENSE.txt || die # For windows - rm -rf ./vendor/modules/code-oss-dev/node_modules/windows-foreground-love || die - rm -rf .vendor/modules/code-oss-dev/node_modules/@parcel/watcher/prebuilds/win32-x64 || die + rm -rf ./"${CODE_OSS_MODULES}"/windows-foreground-love || die + rm -rf ."${CODE_OSS_MODULES}"/@parcel/watcher/prebuilds/win32-x64 || die if [[ $ELIBC != "musl" ]]; then rm -rf ./node_modules/@node-rs/argon2-linux-x64-musl || die - rm ./vendor/modules/code-oss-dev/node_modules/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node || die + rm ./"${CODE_OSS_MODULES}"/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node || die elif [[ $ELIBC != "glibc" ]]; then - rm ./vendor/modules/code-oss-dev/node_modules/@parcel/watcher/prebuilds/linux-x64/node.napi.glibc.node || die + rm ./"${CODE_OSS_MODULES}"/@parcel/watcher/prebuilds/linux-x64/node.napi.glibc.node || die fi # We don't need electron - rm -rf ./vendor/modules/code-oss-dev/node_modules/electron || die - rm ./vendor/modules/code-oss-dev/node_modules/.bin/electron + rm -rf ./"${CODE_OSS_MODULES}"/electron || die + rm ./"${CODE_OSS_MODULES}"/.bin/electron } src_install() { @@ -113,7 +121,7 @@ src_install() { dosym -r "/opt/${PN}/bin/${MY_PN}" "${EPREFIX}/usr/bin/${PN}" dosym -r "/usr/bin/rg" \ - "${EPREFIX}/opt/${PN}/vendor/modules/code-oss-dev/node_modules/vscode-ripgrep/bin/rg" + "${EPREFIX}/opt/${PN}/${CODE_OSS_MODULES}/vscode-ripgrep/bin/rg" systemd_douserunit "${FILESDIR}/${MY_PN}.service" }