From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55633)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1etYdy-0000mo-Jj
	for guix-patches@gnu.org; Wed, 07 Mar 2018 07:58:07 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1etYdu-00028U-P7
	for guix-patches@gnu.org; Wed, 07 Mar 2018 07:58:06 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:40629)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1etYdu-00028O-Km
	for guix-patches@gnu.org; Wed, 07 Mar 2018 07:58:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1etYdu-000110-DG
	for guix-patches@gnu.org; Wed, 07 Mar 2018 07:58:02 -0500
Subject: [bug#30733] [PATCH staging 1/3] gnu: evolution-data-server: Update to
	3.26.6.
Resent-Message-ID: <handler.30733.B30733.15204274553851@debbugs.gnu.org>
From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=)
References: <20180306163126.2109-1-mbakke@fastmail.com>
	<20180306163415.2697-1-mbakke@fastmail.com>
Date: Wed, 07 Mar 2018 13:57:20 +0100
In-Reply-To: <20180306163415.2697-1-mbakke@fastmail.com> (Marius Bakke's
	message of "Tue, 6 Mar 2018 17:34:13 +0100")
Message-ID: <87fu5ct55b.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Marius Bakke <mbakke@fastmail.com>
Cc: 30733@debbugs.gnu.org

Hi!

Marius Bakke <mbakke@fastmail.com> skribis:

> * gnu/packages/gnome.scm (evolution-data-server): Update to 3.26.6.
> [arguments]: Set RUNPATH in #:configure-flags to match new libdir structu=
re.
> Add phase 'dont-override-rpath' to make the build system respect it.

LGTM!

> +       (let* ((lib (string-append (assoc-ref %outputs "out")
> +                                  "/lib"))
> +              (runpaths (map (lambda (s) (string-append
> +                                          lib "/evolution-data-server/" =
s))
> +                             '("addressbook-backends" "calendar-backends"
> +                               "camel-providers" "credential-modules"
> +                               "registry-modules"))))

[...]

> +               (string-append "-DCMAKE_INSTALL_RPATH=3D" lib ";"
> +                              (string-append lib "/evolution-data-server=
;")
> +                              (string-join runpaths ";"))

[...]

> +         (add-before 'configure 'dont-override-rpath
> +           (lambda _
> +             (substitute* "CMakeLists.txt"
> +               (("SET\\(CMAKE_INSTALL_RPATH .*") ""))

Is this because cmake fails to determine the right RUNPATH?  Perhaps add
a short comment about this.

Thanks!

Ludo=E2=80=99.