From patchwork Wed Jan 9 16:02:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 706 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CBA3F16A48; Wed, 9 Jan 2019 16:04:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4D99816A46 for ; Wed, 9 Jan 2019 16:04:11 +0000 (GMT) Received: from localhost ([127.0.0.1]:52533 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghGKw-000397-St for patchwork@mira.cbaines.net; Wed, 09 Jan 2019 11:04:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37214) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghGKq-00036A-35 for guix-patches@gnu.org; Wed, 09 Jan 2019 11:04:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghGKp-0005PY-5e for guix-patches@gnu.org; Wed, 09 Jan 2019 11:04:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53153) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ghGKn-0005O2-WF for guix-patches@gnu.org; Wed, 09 Jan 2019 11:04:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ghGKn-0000zB-Qj for guix-patches@gnu.org; Wed, 09 Jan 2019 11:04:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34021] [PATCH 1/1] gnu: kinit: Use KDEINIT5_LIBRARY_PATH to search for dynlibs. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 09 Jan 2019 16:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34021 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34021@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15470497853723 (code B ref -1); Wed, 09 Jan 2019 16:04:01 +0000 Received: (at submit) by debbugs.gnu.org; 9 Jan 2019 16:03:05 +0000 Received: from localhost ([127.0.0.1]:52434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ghGJt-0000xz-Br for submit@debbugs.gnu.org; Wed, 09 Jan 2019 11:03:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54866) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ghGJr-0000x4-Mb for submit@debbugs.gnu.org; Wed, 09 Jan 2019 11:03:04 -0500 Received: from lists.gnu.org ([209.51.188.17]:35313) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ghGJm-0004o2-Io for submit@debbugs.gnu.org; Wed, 09 Jan 2019 11:02:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghGJl-0002QX-Fo for guix-patches@gnu.org; Wed, 09 Jan 2019 11:02:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghGJf-0004kH-Tx for guix-patches@gnu.org; Wed, 09 Jan 2019 11:02:57 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:57771) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ghGJf-0004iq-NE for guix-patches@gnu.org; Wed, 09 Jan 2019 11:02:51 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43ZYn5058lz1r7S8 for ; Wed, 9 Jan 2019 17:02:48 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43ZYn46wWkz1qsnG for ; Wed, 9 Jan 2019 17:02:48 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id sd9oOQhQ9_w9 for ; Wed, 9 Jan 2019 17:02:48 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-83-171-168-202.dynamic.mnet-online.de [83.171.168.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for ; Wed, 9 Jan 2019 17:02:48 +0100 (CET) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id D163F601FF for ; Wed, 9 Jan 2019 17:04:13 +0100 (CET) From: Hartmut Goebel Date: Wed, 9 Jan 2019 17:02:46 +0100 Message-Id: <20190109160246.23799-1-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.13.7 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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);