[bug#27774] [PATCH] gnu: add libgeotiff

[Marius Bakke]

Hi Björn!

Björn Höfling <address@hidden> writes:

> From 4e96405382258d0aa3a1760ac77dd0ac72706786 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Bj=C3=B6rn=20H=C3=B6fling?=
>  <address@hidden>
> Date: Tue, 24 Jan 2017 09:00:07 +0100
> Subject: [PATCH] gnu: add libgeotiff
>
> * gnu/packages/geo.scm (libgeotiff): New variable.

[...]
  
> +(define-public libgeotiff
> +  (package
> +   (name "libgeotiff")
> +   (version "1.4.2")
> +   (source (origin
> +            (method url-fetch)
> +            (uri (string-append 
> "http://download.osgeo.org/geotiff/libgeotiff/";
> +                                "libgeotiff-"
> +                                version ".tar.gz"))
> +            (sha256
> +             (base32
> +              "0vjy3bwfhljjx66p9w999i4mdhsf7vjshx29yc3pn5livf5091xd"))))
> +   (build-system gnu-build-system)
> +   (arguments
> +    `(#:configure-flags
> +      `( ,(string-append "--with-zlib")
> +         ,(string-append "--with-jpeg")
> +         ,(string-append "--with-libtiff="
> +                         (assoc-ref %build-inputs "libtiff")))

I think this can be reduced to...

#:configure-flags
(list "--with-zlib" "--with-jpeg"
      (string-append "--with-libtiff" (assoc-ref ....)))

> +    #:phases
> +    (modify-phases %standard-phases
> +      (add-after
> +          'unpack 'delete-nonfree-files
> +        (lambda _
> +          ;; Remove .csv-files, distributed from
> +          ;; EPSG under a restricted license.
> +          ;; See LICENSE.txt for full license text.
> +          (for-each delete-file (find-files "." "\\.csv$"))
> +          ;; Now that we remove the csv-files, we need to modify the 
> Makefile:
> +          (substitute* "Makefile.in"
> +            (("all-am: Makefile \\$\\(LTLIBRARIES\\) \\$\\(DATA\\) 
> \\$\\(HEADERS\\) geo_config.h")
> +             "all-am: Makefile $(LTLIBRARIES) $(HEADERS) geo_config.h")
> +            (("install-data-am: install-dist_csvDATA install-includeHEADERS")
> +             "install-data-am: install-includeHEADERS"))
> +          #t)))))

Thanks for finding this. Can you move this section to a 'snippet'
instead? Otherwise these restricted files will show up in `guix build -S
libgeotiff`, which we can not allow.

The rest LGTM!

signature.asc
Description: PGP signature