GNU bug report logs - #31014
[PATCH core-updates] build-system/meson: Don't override LDFLAGS if already set.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 31014 in the body.
You can then email your comments to 31014 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: guix-patches <at> gnu.org
Cc: Marius Bakke <mbakke <at> fastmail.com>
Subject: [PATCH core-updates] build-system/meson: Don't override LDFLAGS if
 already set.
Date: Sun,  1 Apr 2018 12:38:45 +0200

* guix/build/meson-build-system.scm (configure): Test for LDFLAGS before
adding ours.
---
 guix/build/meson-build-system.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/build/meson-build-system.scm b/guix/build/meson-build-system.scm
index e8cb5440e..e7690a4c3 100644
--- a/guix/build/meson-build-system.scm
+++ b/guix/build/meson-build-system.scm
@@ -53,7 +53,8 @@
     ;; * <https://github.com/mesonbuild/meson/issues/314>
     ;; * <https://github.com/mesonbuild/meson/issues/3038>
     ;; * <https://github.com/NixOS/nixpkgs/issues/31222>
-    (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib"))
+    (unless (getenv "LDFLAGS")
+      (setenv "LDFLAGS" (string-append "-Wl,-rpath=" out "/lib")))
 
     (mkdir build-dir)
     (chdir build-dir)
-- 
2.16.3

Message #8 received at 31014 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 31014 <at> debbugs.gnu.org
Subject: Re: [bug#31014] [PATCH core-updates] build-system/meson: Don't
 override LDFLAGS if already set.
Date: Sun, 01 Apr 2018 14:38:38 +0200

Marius Bakke <mbakke <at> fastmail.com> skribis:

> * guix/build/meson-build-system.scm (configure): Test for LDFLAGS before
> adding ours.

LGTM!

It might make sense eventually to add #:ld-flags and have only one place
that calls ‘setenv’, for clarity (global variables are evil!).

Thanks,
Ludo’.

Message #13 received at 31014-done <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 31014-done <at> debbugs.gnu.org
Subject: Re: [bug#31014] [PATCH core-updates] build-system/meson: Don't
 override LDFLAGS if already set.
Date: Mon, 02 Apr 2018 03:05:19 +0200

[Message part 1 (text/plain, inline)]

Ludovic Courtès <ludo <at> gnu.org> writes:

> Marius Bakke <mbakke <at> fastmail.com> skribis:
>
>> * guix/build/meson-build-system.scm (configure): Test for LDFLAGS before
>> adding ours.
>
> LGTM!
>
> It might make sense eventually to add #:ld-flags and have only one place
> that calls ‘setenv’, for clarity (global variables are evil!).

I agree that would be nicer.  I'll try to add something like that before
the next rebuild.  I keep hoping that upstream will improve the RUNPATH
situation, but not holding my breath.

Pushed!

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.