From 7349f926c70d92b4ade0da2201d0df797e73fe07 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Oct 2019 14:28:11 +0200 Subject: gnu: ucl: Build with the C90 standard. Fixes . Reported by Pierre Neidhardt . * gnu/packages/compression.scm (ucl)[arguments]: New field. --- gnu/packages/compression.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index c4298c1e95..b63ca4da32 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1901,6 +1901,9 @@ The specification of the Brotli Compressed Data Format is defined in RFC 7932.") (base32 "0j036lkwsxvm15gr29n8wn07cqq79dswjs9k54939ms5zngjjrdq")))) (build-system gnu-build-system) + (arguments + `(;; UCL 1.03 fails to build with newer C standards. + #:configure-flags '("CFLAGS=-std=gnu90"))) (home-page "http://www.oberhumer.com/opensource/ucl/") (synopsis "Portable lossless data compression library") (description "UCL implements a number of compression algorithms that -- cgit v1.2.3 From 01c8b90b7b76ac183572dd7bac3c25fb53492954 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Oct 2019 14:29:01 +0200 Subject: gnu: ucl: Update home page. * gnu/packages/compression.scm (ucl)[source, home-page]: Use HTTPS. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index b63ca4da32..41301d667c 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1895,7 +1895,7 @@ The specification of the Brotli Compressed Data Format is defined in RFC 7932.") (version "1.03") (source (origin (method url-fetch) - (uri (string-append "http://www.oberhumer.com/opensource/" + (uri (string-append "https://www.oberhumer.com/opensource/" name "/download/" name "-" version ".tar.gz")) (sha256 (base32 @@ -1904,7 +1904,7 @@ The specification of the Brotli Compressed Data Format is defined in RFC 7932.") (arguments `(;; UCL 1.03 fails to build with newer C standards. #:configure-flags '("CFLAGS=-std=gnu90"))) - (home-page "http://www.oberhumer.com/opensource/ucl/") + (home-page "https://www.oberhumer.com/opensource/ucl/") (synopsis "Portable lossless data compression library") (description "UCL implements a number of compression algorithms that achieve an excellent compression ratio while allowing fast decompression. -- cgit v1.2.3 From 41c27444637e4bd8817a30e2b933e85abedadcc8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Oct 2019 14:34:05 +0200 Subject: gnu: ucl: Build shared library instead of static. * gnu/packages/compression.scm (ucl)[arguments]: Add "--enable-shared" and "--disable-static" in #:configure-flags. --- gnu/packages/compression.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 41301d667c..ffe9279345 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1903,7 +1903,8 @@ The specification of the Brotli Compressed Data Format is defined in RFC 7932.") (build-system gnu-build-system) (arguments `(;; UCL 1.03 fails to build with newer C standards. - #:configure-flags '("CFLAGS=-std=gnu90"))) + #:configure-flags '("CFLAGS=-std=gnu90" + "--enable-shared" "--disable-static"))) (home-page "https://www.oberhumer.com/opensource/ucl/") (synopsis "Portable lossless data compression library") (description "UCL implements a number of compression algorithms that -- cgit v1.2.3 From d8963031afa3044fe5c52d04d174a209ca6bd618 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Oct 2019 14:43:27 +0200 Subject: gnu: upx: Fix UCL input. UCL is a runtime dependency, and thus should not be a native input. * gnu/packages/compression.scm (upx)[native-inputs]: Move UCL from here ... [inputs]: ... to here. --- gnu/packages/compression.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages/compression.scm') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index ffe9279345..6279c929de 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1928,9 +1928,11 @@ decompression is a little bit slower.") "08anybdliqsbsl6x835iwzljahnm9i7v26icdjkcv33xmk6p5vw1")) (patches (search-patches "upx-fix-CVE-2017-15056.patch")))) (build-system gnu-build-system) - (native-inputs `(("perl" ,perl) - ("ucl" ,ucl))) - (inputs `(("zlib" ,zlib))) + (native-inputs + `(("perl" ,perl))) + (inputs + `(("ucl" ,ucl) + ("zlib" ,zlib))) (arguments `(#:make-flags (list "all" -- cgit v1.2.3