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 ABE361581D3 for ; Tue, 14 May 2024 00:13:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A205EE2A2D; Tue, 14 May 2024 00:12:59 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 804B2E2A2D for ; Tue, 14 May 2024 00:12:59 +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 7687533BF41 for ; Tue, 14 May 2024 00:12:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B8F215F8 for ; Tue, 14 May 2024 00:12:56 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1715645445.ea4fb2a1e34900635d0db7bd1d8e5e1bea06ced0.sam@gentoo> Subject: [gentoo-commits] proj/gentoo-functions:master commit in: / X-VCS-Repository: proj/gentoo-functions X-VCS-Files: functions.sh functions.sh.in meson.build X-VCS-Directories: / X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ea4fb2a1e34900635d0db7bd1d8e5e1bea06ced0 X-VCS-Branch: master Date: Tue, 14 May 2024 00:12:56 +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: 40b8cab7-199c-4c69-b752-557e7350b443 X-Archives-Hash: dacd678d2af99ce5eb0accf8544fa0a8 commit: ea4fb2a1e34900635d0db7bd1d8e5e1bea06ced0 Author: Sam James gentoo org> AuthorDate: Tue May 14 00:10:24 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue May 14 00:10:45 2024 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=ea4fb2a1 Cleanup functions.sh.in template No longer needed since bfd5710de9b14712c4a621259b951bd10489d0c0. Signed-off-by: Sam James gentoo.org> functions.sh.in => functions.sh | 0 meson.build | 14 ++------------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/functions.sh.in b/functions.sh similarity index 100% rename from functions.sh.in rename to functions.sh diff --git a/meson.build b/meson.build index 6846d40..f18c5f8 100644 --- a/meson.build +++ b/meson.build @@ -8,18 +8,8 @@ project( ] ) -conf_data = configuration_data() -conf_data.set('version', meson.project_version()) -# For now, we can't really use libexec, given everyone hardcodes /lib/gentoo. -# We might be able to install some symlinks to get around this though? -conf_data.set('GENTOO_LIBEXEC_DIR', get_option('prefix') / 'lib' / 'gentoo') - -# TODO: Cleanup now that functions.sh no longer uses ecma48-cpr -configure_file( - input: 'functions.sh.in', - output: 'functions.sh', - configuration: conf_data, - install: true, +install_data( + 'functions.sh', install_dir: 'lib/gentoo' )