04/08: gnu: hplip: Do not keep reference to GCC.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit ea843715b56c935cfb73c6fed23c31c32ec13712
Author: Ludovic Courtès <address@hidden>
Date:   Fri Mar 15 22:14:01 2019 +0100

    gnu: hplip: Do not keep reference to GCC.
    
    Previously the 'dat2drv' and 'locatedriver' programs would be installed
    to share/hplip, and thus they would not get stripped during the 'strip'
    phase.  Consequently, they retained references to GCC.
    
    * gnu/packages/cups.scm (hplip)[source](snippet): Change "data2drvdir"
    and "locatedriverdir" in Makefile.in.
---
 gnu/packages/cups.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index fa6e3ae..b943444 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -430,9 +430,19 @@ should only be used as part of the Guix cups-pk-helper 
service.")
                                         (lambda (file stat)
                                           (elf-file? file))))
                   (delete-file "prnt/hpcups/ImageProcessor.h")
+
                   ;; Fix type mismatch.
                   (substitute* "prnt/hpcups/genPCLm.cpp"
                     (("boolean") "bool"))
+
+                  ;; Install binaries under libexec/hplip instead of
+                  ;; share/hplip; that'll at least ensure they get stripped.
+                  ;; It's not even clear that they're of any use though...
+                  (substitute* "Makefile.in"
+                    (("^dat2drvdir =.*")
+                     "dat2drvdir = $(pkglibexecdir)\n")
+                    (("^locatedriverdir =.*")
+                     "locatedriverdir = $(pkglibexecdir)\n"))
                   #t))))
     (build-system gnu-build-system)
     (home-page "https://developers.hp.com/hp-linux-imaging-and-printing";)