[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/13: gnu: astyle: Use G-expressions.
From: |
guix-commits |
Subject: |
06/13: gnu: astyle: Use G-expressions. |
Date: |
Wed, 27 Sep 2023 18:47:00 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit cf6bbf185de5d025e6d07b8e9b5a2dbbf0386c6b
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Sep 24 02:00:00 2023 +0200
gnu: astyle: Use G-expressions.
* gnu/packages/code.scm (astyle)[arguments]:
Rewrite as G-expressions.
---
gnu/packages/code.scm | 70 ++++++++++++++++++++++++++-------------------------
1 file changed, 36 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index 38b6eb4513..8835272ce4 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -845,42 +845,44 @@ Objective@tie{}C, D, Java, Pawn, and Vala). Features:
(base32 "1ms54wcs7hg1bsywqwf2lhdfizgbk7qxc9ghasxk8i99jvwlrk6b"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ;no tests
- #:make-flags (list (string-append "prefix=" %output)
- "INSTALL=install"
- "all")
- #:modules ((guix build gnu-build-system) ;; FIXME use %default-modules
+ (list
+ #:tests? #f ;no tests
+ #:make-flags
+ #~(list (string-append "prefix=" #$output)
+ "INSTALL=install"
+ "all")
+ #:modules '((guix build gnu-build-system) ;FIXME use %default-modules
(guix build utils)
(ice-9 regex))
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda _ (chdir "build/gcc")))
- (add-after 'install 'install-libs
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Libraries and includes are not installed by default
- (let* ((output (assoc-ref outputs "out"))
- (incdir (string-append output "/include"))
- (libdir (string-append output "/lib")))
- (define (make-so-link sofile strip-pattern)
- (symlink
- (basename sofile)
- (regexp-substitute #f
- (string-match strip-pattern sofile)
- 'pre)))
- (mkdir-p incdir)
- (copy-file "../../src/astyle.h"
- (string-append incdir "/astyle.h"))
- (mkdir-p libdir)
- (for-each (lambda (l)
- (copy-file
- l (string-append libdir "/" (basename l))))
- (find-files "bin" "^lib.*\\.so"))
- (for-each
- (lambda (sofile)
- (make-so-link sofile "(\\.[0-9]){3}$") ;; link .so
- (make-so-link sofile "(\\.[0-9]){2}$")) ;; link .so.3
- (find-files libdir "lib.*\\.so\\..*"))))))))
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'configure
+ (lambda _
+ (chdir "build/gcc")))
+ (add-after 'install 'install-more
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Libraries and headers aren't installed by default.
+ (let ((include (string-append #$output "/include"))
+ (lib (string-append #$output "/lib")))
+ (define (link.so file strip-pattern)
+ (symlink
+ (basename file)
+ (regexp-substitute #f
+ (string-match strip-pattern file)
+ 'pre)))
+ (mkdir-p include)
+ (copy-file "../../src/astyle.h"
+ (string-append include "/astyle.h"))
+ (mkdir-p lib)
+ (for-each (lambda (l)
+ (copy-file
+ l (string-append lib "/" (basename l))))
+ (find-files "bin" "^lib.*\\.so"))
+ (for-each
+ (lambda (file)
+ (link.so file "(\\.[0-9]+){3}$") ;.so
+ (link.so file "(\\.[0-9]+){2}$")) ;.so.3
+ (find-files lib "lib.*\\.so\\..*"))))))))
(home-page "https://astyle.sourceforge.net/")
(synopsis "Source code indenter, formatter, and beautifier")
(description
- branch master updated (d0438fcf65 -> be2344fbea), guix-commits, 2023/09/27
- 08/13: gnu: libdeflate: Update to 1.19., guix-commits, 2023/09/27
- 10/13: gnu: minicom: Update package style., guix-commits, 2023/09/27
- 12/13: gnu: rizin: Edit synopsis., guix-commits, 2023/09/27
- 06/13: gnu: astyle: Use G-expressions.,
guix-commits <=
- 13/13: gnu: 7kaa: Update to 2.15.6., guix-commits, 2023/09/27
- 11/13: gnu: rizin: Update to 0.6.2., guix-commits, 2023/09/27
- 02/13: gnu: nmrpflash: Use G-expressions., guix-commits, 2023/09/27
- 09/13: gnu: minicom: Update to 2.9., guix-commits, 2023/09/27
- 05/13: gnu: astyle: Omit static libraries., guix-commits, 2023/09/27
- 07/13: gnu: astyle: Don't build static or debug libraries., guix-commits, 2023/09/27
- 04/13: gnu: astyle: Update to 3.4.8., guix-commits, 2023/09/27
- 03/13: read-print: Be more mindful of horizontal space in packages., guix-commits, 2023/09/27
- 01/13: gnu: nmrpflash: Update to 0.9.21., guix-commits, 2023/09/27