[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/08: gnu: cups-filter: Install backends and filters under lib/cups.
From: |
Ludovic Courtès |
Subject: |
05/08: gnu: cups-filter: Install backends and filters under lib/cups. |
Date: |
Sat, 27 Jun 2015 19:39:16 +0000 |
civodul pushed a commit to branch wip-diet
in repository guix.
commit 6778619d429f44093046c08bf168d1a7c02a9a77
Author: Ludovic Courtès <address@hidden>
Date: Sat Jun 27 19:31:59 2015 +0200
gnu: cups-filter: Install backends and filters under lib/cups.
This ensures that they are stripped during the 'strip' phase, thereby
removing
references to GCC and linux-libre-headers that would otherwise be found in
debugging symbols.
* gnu/packages/cups.scm (cups-filters)[source]: Change pkgbackenddir and
pkgfilterdir to $(PREFIX)/lib/cups/{filter,backend}.
(cups)[arguments]: Adjust accordingly.
---
gnu/packages/cups.scm | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 05b129d..8d86cd6 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2015 Ludovic Courtès <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -54,10 +55,12 @@
"CUPS_DATADIR = $(PREFIX)/share/cups")
(("pkgcupsserverrootdir = \\$\\(CUPS_SERVERROOT\\)")
"pkgcupsserverrootdir = $(PREFIX)")
+ ;; Choose standard directories notably so that binaries are
+ ;; stripped.
(("pkgbackenddir = \\$\\(CUPS_SERVERBIN\\)/backend")
- "pkgbackenddir = $(PREFIX)/backend")
+ "pkgbackenddir = $(PREFIX)/lib/cups/backend")
(("pkgfilterdir = \\$\\(CUPS_SERVERBIN\\)/filter")
- "pkgfilterdir = $(PREFIX)/filter")))))
+ "pkgfilterdir = $(PREFIX)/lib/cups/filter")))))
(build-system gnu-build-system)
(arguments
`(#:make-flags (list (string-append "PREFIX=" %output))
@@ -196,7 +199,7 @@ device-specific programs to convert and print many types of
files.")
(string-append
"for dir in "
(assoc-ref %outputs "out") "/lib/cups/filter "
- filters "/filter"))
+ filters "/lib/cups/filter"))
;; check for charsets in cups-filters output
(("/usr/share/cups/charsets")
@@ -264,15 +267,16 @@ device-specific programs to convert and print many types
of files.")
(lambda (f)
(symlink f
(string-append out "/lib/cups/filter" (basename f))))
- (find-files (string-append cups-filters "/filter") ".*"))
+ (find-files (string-append cups-filters "/lib/cups/filter")))
;; backends
(for-each
(lambda (f)
(symlink (string-append cups-filters f)
- (string-append out "/lib/cups" f)))
- '("/backend/parallel"
- "/backend/serial"))
+ (string-append out "/lib/cups/backend/"
+ (basename f))))
+ '("/lib/cups/backend/parallel"
+ "/lib/cups/backend/serial"))
;; banners
(let ((banners "/share/cups/banners"))
- branch wip-diet created (now 887dec8), Ludovic Courtès, 2015/06/27
- 02/08: gnu: mutt: Don't retain reference to GCC., Ludovic Courtès, 2015/06/27
- 01/08: gnu: ghostscript: Add "doc" output., Ludovic Courtès, 2015/06/27
- 05/08: gnu: cups-filter: Install backends and filters under lib/cups.,
Ludovic Courtès <=
- 06/08: gnu: qt-4: Use 'modify-phases'., Ludovic Courtès, 2015/06/27
- 07/08: gnu: qt-4: Use a more standard directory layout., Ludovic Courtès, 2015/06/27
- 03/08: gnu: mysql: Strip references and GCC and other build-time dependencies., Ludovic Courtès, 2015/06/27
- 04/08: gnu: mysql: Remove unnecessary binaries., Ludovic Courtès, 2015/06/27
- 08/08: gnu: qt-4: Remove reference from "out" to "doc"., Ludovic Courtès, 2015/06/27