From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHVkH-0002gh-HL for guix-patches@gnu.org; Sun, 04 Jun 2017 09:39:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHVkE-0007qp-Bs for guix-patches@gnu.org; Sun, 04 Jun 2017 09:39:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:52110) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHVkE-0007qZ-7n for guix-patches@gnu.org; Sun, 04 Jun 2017 09:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dHVkE-0008IF-1k for guix-patches@gnu.org; Sun, 04 Jun 2017 09:39:02 -0400 Subject: bug#27220: [PATCH 3/3] gnu: openldap: Provide path to cyrus-sasl for libtool. Resent-Message-ID: From: Marius Bakke In-Reply-To: References: Date: Sun, 04 Jun 2017 15:38:29 +0200 Message-ID: <87shjfyisq.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Leo Famulari , 27220@debbugs.gnu.org --=-=-= Content-Type: text/plain Leo Famulari writes: > * gnu/packages/openldap.scm (openldap)[arguments]: Add 'patch-sasl-path' phase.. > --- > gnu/packages/openldap.scm | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm > index 3fd19632b..9a68d553b 100644 > --- a/gnu/packages/openldap.scm > +++ b/gnu/packages/openldap.scm > @@ -72,7 +72,17 @@ > #:phases > (modify-phases %standard-phases > (add-after 'configure 'provide-libtool > - (lambda _ (copy-file (which "libtool") "libtool")))))) > + (lambda _ (copy-file (which "libtool") "libtool"))) > + (add-after 'install 'patch-sasl-path > + ;; Give -L arguments for cyrus-sasl to avoid propagation. > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (let ((out (assoc-ref outputs "out")) > + (sasl (assoc-ref inputs "cyrus-sasl"))) > + (substitute* (map (lambda (f) (string-append out "/" f)) > + '("lib/libldap.la" "lib/libldap_r.la")) > + (("-lsasl2" lib) > + (string-append "-L" sasl "/lib " lib))) > + #t)))))) Good find. LGTM, but I wonder if it would be better to remove the static library (and associated .la files) and instead provide an explicit static-package. This mostly for grafting purposes. However, I think that's a journey for another core-updates. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlk0DVYACgkQoqBt8qM6 VPorIwf/UoKZB2S1JDQRzplX54r7SBzfzaEJjxl+pzFV4H+WsJvVyDMqdGZH2Leo PzDs/ten1Wk46za7PaWtGacaOI5eU/Uk7JrZrJelNJHHeK27jhvHObnmr71L6eEz yJRkQFHXygkWIpDniNHI1WHXcZoLLn17xmGvd8Obj5jYKybFVgS8lhjFnbmN0Xn7 8PSnZ7h4MI3DRaRCErl2N0VWSckrrfCqCVYd0y6uV5i1ZJUsSKcMVskDi6yS2kjk IJyajAR64X5LDkQZepY64rEFGixX1fDE07xmcWxw83FcHPUP3N2ZJoU/PdKqtS9B eCXpttz/pVvPr/66GtK3rglaAC1sSg== =Wxxz -----END PGP SIGNATURE----- --=-=-=--