Subject: [bug#30733] [PATCH staging 1/3] gnu: evolution-data-server: Update to 3.26.6.

From: [email-masked] (Ludovic Courtès)
Date: Wed, 07 Mar 2018 13:57:20 +0100

Hi!

Marius Bakke <[email-masked]> skribis:

> * gnu/packages/gnome.scm (evolution-data-server): Update to 3.26.6.
> [arguments]: Set RUNPATH in #:configure-flags to match new libdir structure.
> 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=" 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’.