From 33fa13eac196517be9bdc615844a29ca4d8e7a83 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Jan 2018 07:29:54 +0100 Subject: gnu: iniparser: Fix documentation directory. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/samba.scm (iniparser)[arguments]: Install documentation to ‘/share/doc/iniparser’ instead of ‘/share/doc’. --- gnu/packages/samba.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/samba.scm') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 345c326300..7e00ca3d05 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -103,7 +104,7 @@ the Linux kernel CIFS client.") "1flj7srvh2hp9ls96qz922bklyhw7f27mmn23b16839zpdjddfz0")))) (build-system gnu-build-system) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) @@ -120,7 +121,7 @@ the Linux kernel CIFS client.") (let* ((out (assoc-ref outputs "out")) (lib (string-append out "/lib")) (inc (string-append out "/include")) - (doc (string-append out "/share/doc")) + (doc (string-append out "/share/doc/" ,name)) (html (string-append doc "/html"))) (define (copy dir) (lambda (file) -- cgit v1.2.3 From cf52c9255d00323f4b1f11a0279aa28e0bfce624 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Jan 2018 07:29:59 +0100 Subject: gnu: iniparser: Use #:make-flags. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/samba.scm (iniparser)[arguments]: Use #:make-flags to set ‘CC’ instead of patching the Makefile. Remove fruitless SYMLINK call. --- gnu/packages/samba.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/samba.scm') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 7e00ca3d05..88c2df6675 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -104,18 +104,19 @@ the Linux kernel CIFS client.") "1flj7srvh2hp9ls96qz922bklyhw7f27mmn23b16839zpdjddfz0")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:make-flags + (list "CC=gcc") + #:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (substitute* '("Makefile" "test/Makefile") (("/usr/lib") - (string-append (assoc-ref outputs "out") "/lib")) - (("\\?= gcc") "= gcc")))) + (string-append (assoc-ref outputs "out") "/lib"))))) (replace 'build - (lambda _ - (and (zero? (system* "make" "libiniparser.so")) - (symlink "libiniparser.so.0" "libiniparser.so")))) + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "libiniparser.so" + make-flags))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From fa5e6618593feab0c764652cd632f4e1bf6558a2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Jan 2018 07:30:03 +0100 Subject: gnu: iniparser: Use INSTALL-FILE. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/samba.scm (iniparser)[arguments]: Simplify ‘install’ phase by replacing COPY-FILE with INSTALL-FILE. --- gnu/packages/samba.scm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'gnu/packages/samba.scm') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 88c2df6675..4de8d89219 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -124,23 +124,18 @@ the Linux kernel CIFS client.") (inc (string-append out "/include")) (doc (string-append out "/share/doc/" ,name)) (html (string-append doc "/html"))) - (define (copy dir) + (define (install dir) (lambda (file) - (copy-file file - (string-append dir "/" - (basename file))))) - (mkdir-p lib) - (for-each (copy lib) - (find-files "." "^lib.*\\.(so\\.|a)")) + (install-file file dir))) + (for-each (install lib) + (find-files "." "^lib.*\\.so")) (with-directory-excursion lib (symlink "libiniparser.so.0" "libiniparser.so")) - (mkdir-p inc) - (for-each (copy inc) + (for-each (install inc) (find-files "src" "\\.h$")) - (mkdir-p html) - (for-each (copy html) + (for-each (install html) (find-files "html" ".*")) - (for-each (copy doc) + (for-each (install doc) '("AUTHORS" "INSTALL" "LICENSE" "README.md")))))))) (home-page "http://ndevilla.free.fr/iniparser") (synopsis "Standalone ini file parsing library") -- cgit v1.2.3 From a9691718e894d0645014d0aeb79e3b867345b560 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Jan 2018 07:30:08 +0100 Subject: gnu: iniparser: Update to 4.1. * gnu/packages/samba.scm (iniparser): Update to 4.1. [arguments]: Update library SONAME. [home-page]: Abandon outdated home page with no mention of version 4. --- gnu/packages/samba.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/samba.scm') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 4de8d89219..7cf02a62cb 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -93,7 +93,7 @@ the Linux kernel CIFS client.") (define-public iniparser (package (name "iniparser") - (version "4.0") + (version "4.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/ndevilla/iniparser/archive/v" @@ -101,7 +101,7 @@ the Linux kernel CIFS client.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1flj7srvh2hp9ls96qz922bklyhw7f27mmn23b16839zpdjddfz0")))) + "1bpk8dj9d5cl64lg6jsk0qlzrpg848nymwxc3fx707fk1n0al3cn")))) (build-system gnu-build-system) (arguments `(#:make-flags @@ -115,7 +115,7 @@ the Linux kernel CIFS client.") (string-append (assoc-ref outputs "out") "/lib"))))) (replace 'build (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "libiniparser.so" + (apply invoke "make" "libiniparser.so.1" make-flags))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) @@ -130,14 +130,14 @@ the Linux kernel CIFS client.") (for-each (install lib) (find-files "." "^lib.*\\.so")) (with-directory-excursion lib - (symlink "libiniparser.so.0" "libiniparser.so")) + (symlink "libiniparser.so.1" "libiniparser.so")) (for-each (install inc) (find-files "src" "\\.h$")) (for-each (install html) (find-files "html" ".*")) (for-each (install doc) '("AUTHORS" "INSTALL" "LICENSE" "README.md")))))))) - (home-page "http://ndevilla.free.fr/iniparser") + (home-page "https://github.com/ndevilla/iniparser") (synopsis "Standalone ini file parsing library") (description "iniparser is a free stand-alone `ini' file parsing library (Windows -- cgit v1.2.3 From adbfc6b9f1adefba488b44d8a0934bdb76d1e600 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Jan 2018 07:30:13 +0100 Subject: gnu: talloc: Update to 2.1.11. * gnu/packages/samba.scm (talloc): Update to 2.1.11. [arguments]: Run all tests. Use INVOKE. --- gnu/packages/samba.scm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'gnu/packages/samba.scm') diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 7cf02a62cb..4acd391a4a 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -233,31 +233,26 @@ Desktops into Active Directory environments using the winbind daemon.") (define-public talloc (package (name "talloc") - (version "2.1.10") + (version "2.1.11") (source (origin (method url-fetch) (uri (string-append "https://www.samba.org/ftp/talloc/talloc-" version ".tar.gz")) (sha256 (base32 - "06gn45if56g81vbj3841fzdjsahrrczwqpfrydm2zv6nxd5yk1f9")))) + "1lzfxv2zjxap5snf9ydl1bqgjpz0kgkq7n644f8rkbx0arav77k3")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) - ;; test_magic_differs.sh has syntax error, and is not in the right - ;; place where wscript expected. - ;; Skip the test. - (substitute* "wscript" - (("magic_ret = .*") "magic_ret = 0\n")) - ;; talloc uses a custom configuration script that runs a - ;; python script called 'waf'. + ;; talloc uses a custom configuration script that runs a Python + ;; script called 'waf', and doesn't tolerate unknown options. (setenv "CONFIG_SHELL" (which "sh")) (let ((out (assoc-ref outputs "out"))) - (zero? (system* "./configure" - (string-append "--prefix=" out))))))))) + (invoke "./configure" + (string-append "--prefix=" out)))))))) (inputs `(("python" ,python-2))) (home-page "https://talloc.samba.org") -- cgit v1.2.3