* [bug#34021] [PATCH 1/1] gnu: kinit: Use KDEINIT5_LIBRARY_PATH to search for dynlibs.
@ 2019-01-09 16:02 Hartmut Goebel
2019-01-11 10:26 ` Ludovic Courtès
[not found] ` <handler.34021.B.15470497853723.ack@debbugs.gnu.org>
0 siblings, 2 replies; 3+ messages in thread
From: Hartmut Goebel @ 2019-01-09 16:02 UTC (permalink / raw)
To: 34021
Using LIBRARY_PATH was introduced in
16b8aff85bcdb9799496c4a27257210cd45158e5, but is wrong since
this variable is used by the compiler (gcc) at link time.
* gnu/packages/patches/kinit-kdeinit-libpath.patch: Change
LIBRARY_PATH to KDEINIT5_LIBRARY_PATH.
* gnu/packages/kde-frameworks.scm (kinit)[native-search-paths]:
New field.
---
gnu/packages/kde-frameworks.scm | 4 ++++
gnu/packages/patches/kinit-kdeinit-libpath.patch | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 62cd2dd2d..72152fd78 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2556,6 +2556,10 @@ in applications using the KDE Frameworks.")
(("GUIX_PKGS_KF5_PARTS") (assoc-ref inputs "kparts"))
(("GUIX_PKGS_KF5_PLASMA") (assoc-ref inputs "plasma-framework")))
#t)))))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "KDEINIT5_LIBRARY_PATH")
+ (files '("lib/")))))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/patches/kinit-kdeinit-libpath.patch b/gnu/packages/patches/kinit-kdeinit-libpath.patch
index 89cf1a941..6382e8804 100644
--- a/gnu/packages/patches/kinit-kdeinit-libpath.patch
+++ b/gnu/packages/patches/kinit-kdeinit-libpath.patch
@@ -23,7 +23,7 @@ pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch
- l.load();
- }
+ // Try to load the library relative to the active profiles.
-+ QByteArrayList profiles = qgetenv("LIBRARY_PATH").split(':');
++ QByteArrayList profiles = qgetenv("KDEINIT5_LIBRARY_PATH").split(':');
+ for (const QByteArray &profile: profiles) {
+ if (!profile.isEmpty()) {
+ l.setFileName(QFile::decodeName(profile) + QStringLiteral("/") + libpath);
--
2.13.7
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#34021] [PATCH 1/1] gnu: kinit: Use KDEINIT5_LIBRARY_PATH to search for dynlibs.
2019-01-09 16:02 [bug#34021] [PATCH 1/1] gnu: kinit: Use KDEINIT5_LIBRARY_PATH to search for dynlibs Hartmut Goebel
@ 2019-01-11 10:26 ` Ludovic Courtès
[not found] ` <handler.34021.B.15470497853723.ack@debbugs.gnu.org>
1 sibling, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2019-01-11 10:26 UTC (permalink / raw)
To: Hartmut Goebel; +Cc: 34021
Hello Hartmut,
Hartmut Goebel <h.goebel@crazy-compilers.com> skribis:
> Using LIBRARY_PATH was introduced in
> 16b8aff85bcdb9799496c4a27257210cd45158e5, but is wrong since
> this variable is used by the compiler (gcc) at link time.
>
> * gnu/packages/patches/kinit-kdeinit-libpath.patch: Change
> LIBRARY_PATH to KDEINIT5_LIBRARY_PATH.
> * gnu/packages/kde-frameworks.scm (kinit)[native-search-paths]:
> New field.
LGTM, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#34021: Acknowledgement ([PATCH 1/1] gnu: kinit: Use KDEINIT5_LIBRARY_PATH to search for dynlibs.)
[not found] ` <handler.34021.B.15470497853723.ack@debbugs.gnu.org>
@ 2019-01-11 15:39 ` Hartmut Goebel
0 siblings, 0 replies; 3+ messages in thread
From: Hartmut Goebel @ 2019-01-11 15:39 UTC (permalink / raw)
To: 34021-close
Commited as 46b082f97f73cd79b40bde15cfe3e4ddb28ba209
--
Regards
Hartmut Goebel
| Hartmut Goebel | h.goebel@crazy-compilers.com |
| www.crazy-compilers.com | compilers which you thought are impossible |
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-01-11 15:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-09 16:02 [bug#34021] [PATCH 1/1] gnu: kinit: Use KDEINIT5_LIBRARY_PATH to search for dynlibs Hartmut Goebel
2019-01-11 10:26 ` Ludovic Courtès
[not found] ` <handler.34021.B.15470497853723.ack@debbugs.gnu.org>
2019-01-11 15:39 ` bug#34021: Acknowledgement ([PATCH 1/1] gnu: kinit: Use KDEINIT5_LIBRARY_PATH to search for dynlibs.) Hartmut Goebel
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.