From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Lepiller Subject: Re: [PATCH 4/4] gnu: ocaml-findlib: Update to 1.7.1. Date: Mon, 02 Jan 2017 21:51:34 +0100 Message-ID: References: <20170102173814.6837-1-david@craven.ch> <20170102173814.6837-4-david@craven.ch> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cO9d9-0003lj-IO for guix-devel@gnu.org; Mon, 02 Jan 2017 15:54:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cO9d5-0007qR-KI for guix-devel@gnu.org; Mon, 02 Jan 2017 15:54:55 -0500 Received: from dau94-h03-89-91-205-84.dsl.sta.abo.bbox.fr ([89.91.205.84]:60775 helo=skaro.lepiller.eu) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cO9d4-0007oH-W3 for guix-devel@gnu.org; Mon, 02 Jan 2017 15:54:51 -0500 Received: from localhost (localhost [127.0.0.1]) by skaro.lepiller.eu (Postfix) with ESMTP id 195278100C for ; Mon, 2 Jan 2017 21:54:47 +0100 (CET) Received: from skaro.lepiller.eu ([127.0.0.1]) by localhost (lepiller.eu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id azQA0CWdSrgi for ; Mon, 2 Jan 2017 21:54:40 +0100 (CET) Received: from [100.118.111.115] (unknown [80.215.165.116]) by skaro.lepiller.eu (Postfix) with ESMTPSA id EF79C7F81F for ; Mon, 2 Jan 2017 21:54:39 +0100 (CET) In-Reply-To: <20170102173814.6837-4-david@craven.ch> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org On January 2, 2017 6:38:14 PM GMT+01:00, David Craven = wrote: >* gnu/packages/ocaml=2Escm (ocaml-findlib)[arguments]: Move > ocaml-findlib-make-install=2Epatch to phase and set ldconf=3D"ignore" i= n > findlib=2Econf=2Ein=2E >* gnu/local=2Emk (dist_patch_DATA): Remove old patch=2E >--- > gnu/local=2Emk | 1 - >gnu/packages/ocaml=2Escm | 34 >+++++++++++++++------- > =2E=2E=2E/patches/ocaml-findlib-make-install=2Epatch | 20 --------= ----- > 3 files changed, 24 insertions(+), 31 deletions(-) >delete mode 100644 >gnu/packages/patches/ocaml-findlib-make-install=2Epatch > >diff --git a/gnu/local=2Emk b/gnu/local=2Emk >index 6ab1c1c48=2E=2E9e35b0d0b 100644 >--- a/gnu/local=2Emk >+++ b/gnu/local=2Emk >@@ -750,7 +750,6 @@ dist_patch_DATA =3D \ > %D%/packages/patches/nvi-dbpagesize-binpower=2Epatch \ > %D%/packages/patches/nvi-db4=2Epatch \ > %D%/packages/patches/ocaml-CVE-2015-8869=2Epatch \ >- %D%/packages/patches/ocaml-findlib-make-install=2Epatch \ > %D%/packages/patches/ola-readdir-r=2Epatch \ > %D%/packages/patches/openexr-missing-samples=2Epatch \ > %D%/packages/patches/openjpeg-CVE-2016-5157=2Epatch \ >diff --git a/gnu/packages/ocaml=2Escm b/gnu/packages/ocaml=2Escm >index f962be8d4=2E=2E2d064408b 100644 >--- a/gnu/packages/ocaml=2Escm >+++ b/gnu/packages/ocaml=2Escm >@@ -720,15 +720,14 @@ to the other=2E") > (define-public ocaml-findlib > (package > (name "ocaml-findlib") >- (version "1=2E6=2E1") >+ (version "1=2E7=2E1") > (source (origin > (method url-fetch) > (uri (string-append "http://download=2Ecamlcity=2Eorg/download= /" > "findlib" "-" version "=2Etar=2Egz")) > (sha256 > (base32 >- =20 >"02abg1lsnwvjg3igdyb8qjgr5kv1nbwl4gaf8mdinzfii5p82721")) >- (patches (search-patches >"ocaml-findlib-make-install=2Epatch")))) >+ =20 >"1vsys5gpahi36nxv5yx29zhwn8b2d7sqqswza05vxy5bx5wrljsx")))) > (build-system gnu-build-system) > (native-inputs > `(("camlp4" ,camlp4) >@@ -738,18 +737,33 @@ to the other=2E") > `(#:tests? #f ; no test suite > #:parallel-build? #f > #:make-flags (list "all" "opt") >- #:phases (modify-phases %standard-phases >- (replace >- 'configure >- (lambda* (#:key inputs outputs #:allow-other-keys) >- (let ((out (assoc-ref outputs "out"))) >- (system* >- "=2E/configure" >+ #:phases >+ (modify-phases %standard-phases >+ (add-after 'unpack 'patch-findlib=2Econf=2Ein >+ (lambda _ >+ (let ((port (open-file "findlib=2Econf=2Ein" "w" #:encoding >"utf-8"))) >+ (format port "ldconf=3D\"ignore\"~%") >+ (close-port port)) >+ #t)) >+ (add-after 'unpack 'patch-findlib-make-install >+ (lambda _ >+ (substitute* "src/findlib/Makefile" >+ (("^=2E*topfind=2E*OCAML_CORE_STDLIB=2E*$") >+ "\ttest $(INSTALL_TOPFIND) -eq 0 || cp topfind >\"$(prefix)$(OCAML_SITELIB)\"\n")) >+ #t)) >+ (replace 'configure >+ (lambda* (#:key inputs outputs #:allow-other-keys) >+ (let ((out (assoc-ref outputs "out"))) >+ (system* "=2E/configure" > "-bindir" (string-append out "/bin") > "-config" (string-append out "/etc/ocamfind=2Econf") > "-mandir" (string-append out "/share/man") > "-sitelib" (string-append out "/lib/ocaml/site-lib") > "-with-toolbox"))))))) >+ (native-search-paths >+ (list (search-path-specification >+ (variable "OCAMLPATH") >+ (files (list (string-append "lib/ocaml/site-lib")))))) You should add this to the ocaml definition, or move the definition from t= he compiler=2E If I'm not mistaken, this overrides the current definition a= nd ocamlfind will not be able to find core modules in lib/ocaml such as 'by= tes'=2E > (home-page "http://projects=2Ecamlcity=2Eorg/projects/findlib=2Ehtml= ") > (synopsis "Management tool for OCaml libraries") > (description >diff --git a/gnu/packages/patches/ocaml-findlib-make-install=2Epatch >b/gnu/packages/patches/ocaml-findlib-make-install=2Epatch >deleted file mode 100644 >index 238f9ca3c=2E=2E000000000 >--- a/gnu/packages/patches/ocaml-findlib-make-install=2Epatch >+++ /dev/null >@@ -1,20 +0,0 @@ >-Ocaml wants to install its "core" libraries in OCAML_CORE_STDLIB=2E=20 >That >-does not work in a store-based distribution=2E >- >-A solution was already provided by Nix >- >- =20 >https://github=2Ecom/NixOS/nixpkgs/blob/master/pkgs/development/tools/oca= ml/findlib/install_topfind=2Epatch >- >-regenerated for Guix=2E >- >---- findlib-1=2E5=2E3/src/findlib/Makefile 2014-09-16 13:21:46=2E0000000= 00 >+0200 >-+++ findlib-1=2E5=2E3/src/findlib/Makefile=2Enew 2014-10-01 >14:30:54=2E141082521 +0200 >-@@ -89,7 +89,7 @@ >- install: all >- mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)" >- mkdir -p "$(prefix)$(OCAMLFIND_BIN)" >-- test $(INSTALL_TOPFIND) -eq 0 || cp topfind >"$(prefix)$(OCAML_CORE_STDLIB)" >-+ test $(INSTALL_TOPFIND) -eq 0 || cp topfind >"$(prefix)$(OCAML_SITELIB)" >- files=3D`$(TOP)/tools/collect_files $(TOP)/Makefile=2Econfig findlib= =2Ecmi >findlib=2Emli findlib=2Ecma topfind=2Ecmi topfind=2Emli fl_package_base= =2Emli >fl_package_base=2Ecmi fl_metascanner=2Emli fl_metascanner=2Ecmi >fl_metatoken=2Ecmi findlib_top=2Ecma findlib=2Ecmxa findlib=2Ea findlib= =2Ecmxs >findlib_dynload=2Ecma findlib_dynload=2Ecmxa findlib_dynload=2Ea >findlib_dynload=2Ecmxs fl_dynload=2Emli fl_dynload=2Ecmi META` && \ >- cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" >- f=3D"ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) >&& f=3D"ocamlfind_opt$(EXEC_SUFFIX)"; }; \ --=20 Sent from my Android device with K-9 Mail=2E Please excuse my brevity=2E