[PATCH 0/2] Install ncurses .pc files; update progress

[PATCH 0/2] Install ncurses .pc files; update progress

[Tobias Geerinckx-Rice]

Guix,

(Intended for core-updates, since it has ‘ncurses’ in the name.)

Let ncurses install its pkg-config .pc files, and let an updated
‘progress’ use them instead of adding ever more work-arounds.

Kind regards,

T G-R

Tobias Geerinckx-Rice (2):
  gnu: ncurses: Install pkg-config ‘.pc’ files.
  gnu: progress: Update to 0.13.1.

 gnu/packages/admin.scm   |  9 ++++++---
 gnu/packages/ncurses.scm | 22 +++++++++++++++++++---
 2 files changed, 25 insertions(+), 6 deletions(-)

-- 
2.9.3

[PATCH 1/2] gnu: ncurses: Install pkg-config ‘.pc’ files.

[Tobias Geerinckx-Rice]

* gnu/packages/ncurses.scm (ncurses)[arguments]: Add ‘--enable-pc-files’
and ‘--with-pkg-config-libdir=’ to #:configure-flags. Create ‘non-wide’
compatibility symbolic links for ‘.pc’ files in the post-install-phase.
[native-inputs]: Add pkg-config.
---
 gnu/packages/ncurses.scm | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm
index 9799167..46e4adc 100644
--- a/gnu/packages/ncurses.scm
+++ b/gnu/packages/ncurses.scm
@@ -26,7 +26,8 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system perl)
   #:use-module (gnu packages)
-  #:use-module (gnu packages perl))
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config))
 
 (define-public ncurses
   (let ((patch-makefile-phase
@@ -68,7 +69,7 @@
             (let ((out (assoc-ref outputs "out")))
               ;; When building a wide-character (Unicode) build, create backward
               ;; compatibility links from the the "normal" libraries to the
-              ;; wide-character libraries (e.g. libncurses.so to libncursesw.so).
+              ;; wide-character ones (e.g. libncurses.so to libncursesw.so).
               (with-directory-excursion (string-append out "/lib")
                 (for-each (lambda (lib)
                             (define libw.a
@@ -81,6 +82,10 @@
                               (string-append "lib" lib ".so.6"))
                             (define lib.so
                               (string-append "lib" lib ".so"))
+                            (define packagew.pc
+                              (string-append lib "w.pc"))
+                            (define package.pc
+                              (string-append lib ".pc"))
 
                             (when (file-exists? libw.a)
                               (format #t "creating symlinks for `lib~a'~%" lib)
@@ -89,7 +94,11 @@
                               (false-if-exception (delete-file lib.so))
                               (call-with-output-file lib.so
                                 (lambda (p)
-                                  (format p "INPUT (-l~aw)~%" lib)))))
+                                  (format p "INPUT (-l~aw)~%" lib))))
+                            (with-directory-excursion "pkgconfig"
+                              (format #t "creating symlink for `~a'~%" package.pc)
+                              (when (file-exists? packagew.pc)
+                                (symlink packagew.pc package.pc))))
                           '("curses" "ncurses" "form" "panel" "menu")))))))
     (package
      (name "ncurses")
@@ -108,6 +117,11 @@
       `(#:configure-flags
         `("--with-shared" "--without-debug" "--enable-widec"
 
+          "--enable-pc-files"
+          ,(string-append "--with-pkg-config-libdir="
+                          (assoc-ref %outputs "out")
+                          "/lib/pkgconfig")
+
           ;; By default headers land in an `ncursesw' subdir, which is not
           ;; what users expect.
           ,(string-append "--includedir=" (assoc-ref %outputs "out")
@@ -128,6 +142,8 @@
                    (add-after 'unpack 'remove-unneeded-shebang
                      ,remove-shebang-phase))))
      (self-native-input? #t)                      ; for `tic'
+     (native-inputs
+      `(("pkg-config" ,pkg-config)))
      (native-search-paths
       (list (search-path-specification
              (variable "TERMINFO_DIRS")
-- 
2.9.3

[PATCH 2/2] gnu: progress: Update to 0.13.1.

[Tobias Geerinckx-Rice]

* gnu/packages/admin.scm (progress): Update to 0.13.1.
[native-inputs]: Add pkg-config and which.
[arguments]: Drop LDFLAGS (now handled by pkg-config) from #:make-flags.
---
 gnu/packages/admin.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 0b50c86..77fd214 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -112,20 +112,23 @@ usual file attributes can be checked for inconsistencies.")
 (define-public progress
   (package
     (name "progress")
-    (version "0.13")
+    (version "0.13.1")
     (source (origin
       (method url-fetch)
       (uri (string-append "https://github.com/Xfennec/"
                           name "/archive/v" version ".tar.gz"))
       (sha256
-       (base32 "133iar4vq5vlklydb4cyazjy6slmpbndrws474mg738bd8avc30n"))
+       (base32 "199rk6608q9m6l0fbjm0xl2w1c5krf8245dqnksdp4rqp7l9ak06"))
       (file-name (string-append name "-" version ".tar.gz"))))
     (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("which" ,which)))
     (inputs
      `(("ncurses" ,ncurses)))
     (arguments
      `(#:tests? #f ; There is no test suite.
-       #:make-flags (list "CC=gcc" "LDFLAGS+=-lncurses"
+       #:make-flags (list "CC=gcc"
                           (string-append "PREFIX=" (assoc-ref %outputs "out")))
        #:phases
        (modify-phases %standard-phases
-- 
2.9.3

Re: [PATCH 1/2] gnu: ncurses: Install pkg-config ‘.pc’ files.

[Mark H Weaver]

Tobias Geerinckx-Rice <me@tobias.gr> writes:

> * gnu/packages/ncurses.scm (ncurses)[arguments]: Add ‘--enable-pc-files’
> and ‘--with-pkg-config-libdir=’ to #:configure-flags. Create ‘non-wide’
> compatibility symbolic links for ‘.pc’ files in the post-install-phase.
> [native-inputs]: Add pkg-config.

This will have to wait for the next 'core-updates' cycle, since it would
require about 13000 rebuilds.  The current 'core-updates' is almost
ready to be merged into 'master'.

       Mark