unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#47577] [core-updates] gnu: meson-for-build: Remove it again
@ 2021-04-03  4:38 宋文武
  2021-04-05  8:05 ` Efraim Flashner
  0 siblings, 1 reply; 3+ messages in thread
From: 宋文武 @ 2021-04-03  4:38 UTC (permalink / raw)
  To: 47577, efraim

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

Hello, on our core-updates branch, meson-for-build was remmoved in
f2b228010873a, but then a merge 2aab587f842908 added it again..

So here is a patch to remove it, also update the FIXME in meson:

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-meson-for-build-Remove-package.patch --]
[-- Type: text/x-patch, Size: 1879 bytes --]

From 3219f0b132c8ae16e319a57a91834ec8be393afc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@member.fsf.org>
Date: Sat, 3 Apr 2021 12:26:03 +0800
Subject: [PATCH] gnu: meson-for-build: Remove package.

It was removed in commit f2b22801, but a merge (2aab587f) add it wrongly
again.
---
 gnu/packages/build-tools.scm | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 5e25c60f3b..b47a790f75 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -278,9 +278,8 @@ files and generates build instructions for the Ninja build system.")
                 "1x47vc7023w8w90r6jda5hk2jsh68i66x49gckdgixw32fwvvf1w"))))
     (build-system python-build-system)
     (arguments
-     `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH
-       ;; patch in meson-for-build, and patching many hard-coded file system
-       ;; locations in "run_unittests.py".
+     `(;; FIXME: Tests require many additional inputs and patching many
+       ;; hard-coded file system locations in "run_unittests.py".
        #:tests? #f
        #:phases (modify-phases %standard-phases
                   ;; Meson calls the various executables in out/bin through the
@@ -327,17 +326,6 @@ resembles Python.")
                (base32
                 "19n8alcpzv6npgp27iqljkmvdmr7s2c7zm8y997j1nlvpa1cgqbj"))))))
 
-(define-public meson-for-build
-  (package
-    (inherit meson)
-    (name "meson-for-build")
-    (source (origin
-              (inherit (package-source meson))
-              (patches (search-patches "meson-for-build-rpath.patch"))))
-
-    ;; People should probably install "meson", not "meson-for-build".
-    (properties `((hidden? . #t)))))
-
 (define-public premake4
   (package
     (name "premake")
-- 
2.30.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [bug#47577] [core-updates] gnu: meson-for-build: Remove it again
  2021-04-03  4:38 [bug#47577] [core-updates] gnu: meson-for-build: Remove it again 宋文武
@ 2021-04-05  8:05 ` Efraim Flashner
  2021-04-10  7:34   ` bug#47577: " 宋文武
  0 siblings, 1 reply; 3+ messages in thread
From: Efraim Flashner @ 2021-04-05  8:05 UTC (permalink / raw)
  To: 宋文武; +Cc: 47577

[-- Attachment #1: Type: text/plain, Size: 779 bytes --]

On Sat, Apr 03, 2021 at 12:38:02PM +0800, 宋文武 wrote:
> Hello, on our core-updates branch, meson-for-build was remmoved in
> f2b228010873a, but then a merge 2aab587f842908 added it again..
> 

I thought that meson-for-build was like cmake-minimal and some others,
it was more useful for building and regular meson (or cmake) was for
installing as the end user. It also lets us update meson if we want
newer features if we want them.

Then again, I didn't mean to un-delete it, so go ahead and push the
patch if that's the way it was supposed to be.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#47577: [core-updates] gnu: meson-for-build: Remove it again
  2021-04-05  8:05 ` Efraim Flashner
@ 2021-04-10  7:34   ` 宋文武
  0 siblings, 0 replies; 3+ messages in thread
From: 宋文武 @ 2021-04-10  7:34 UTC (permalink / raw)
  To: Efraim Flashner; +Cc: 47577-done

Efraim Flashner <efraim@flashner.co.il> writes:

> On Sat, Apr 03, 2021 at 12:38:02PM +0800, 宋文武 wrote:
>> Hello, on our core-updates branch, meson-for-build was remmoved in
>> f2b228010873a, but then a merge 2aab587f842908 added it again..
>> 
>
> I thought that meson-for-build was like cmake-minimal and some others,
> it was more useful for building and regular meson (or cmake) was for
> installing as the end user. It also lets us update meson if we want
> newer features if we want them.
>
> Then again, I didn't mean to un-delete it, so go ahead and push the
> patch if that's the way it was supposed to be.

Okay, pushed, thank you!




^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-04-10  7:33 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-03  4:38 [bug#47577] [core-updates] gnu: meson-for-build: Remove it again 宋文武
2021-04-05  8:05 ` Efraim Flashner
2021-04-10  7:34   ` bug#47577: " 宋文武

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).