guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: gnu: astyle: Create symlinks for .so files, too.


From: guix-commits
Subject: 01/02: gnu: astyle: Create symlinks for .so files, too.
Date: Thu, 21 Nov 2019 12:59:15 -0500 (EST)

htgoebel pushed a commit to branch staging
in repository guix.

commit 62b8ae1a910d4b89287ead11bd2c18325e660bdf
Author: Hartmut Goebel <address@hidden>
Date:   Wed Nov 6 22:45:23 2019 +0100

    gnu: astyle: Create symlinks for .so files, too.
    
    The Makefile only creates files with a versioned extension (.so.3.1.0),
    which are not picked up be cmake's `find_libarary()`. (Instead cmake
    picks up the static .a library.)
    
    Symlinks for .so.3 are required to avoid phase `verify-runpath` fails.
    
    * gnu/packages/code.scm(astyle)[argumements]<modules>: New element.
      <phases>{install-libs}: Add creating symlinks.
---
 gnu/packages/code.scm | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index 20726cf..7656ee8 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2014 Eric Bavier <address@hidden>
 ;;; Copyright © 2013 Andreas Enge <address@hidden>
 ;;; Copyright © 2014 Mark H Weaver <address@hidden>
+;;; Copyright © 2019 Hartmut Goebel <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -597,6 +598,9 @@ Objective@tie{}C, D, Java, Pawn, and Vala).  Features:
        #: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
@@ -606,12 +610,22 @@ Objective@tie{}C, D, Java, Pawn, and Vala).  Features:
              ;; Libraries are not installed by default
              (let* ((output (assoc-ref outputs "out"))
                     (libdir (string-append output "/lib")))
-               (begin
-                 (mkdir-p libdir)
-                 (for-each (lambda (l)
-                             (copy-file
-                              l (string-append libdir "/" (basename l))))
-                           (find-files "bin" "lib*"))))
+               (define (make-so-link sofile strip-pattern)
+                 (symlink
+                  (basename sofile)
+                  (regexp-substitute #f
+                                     (string-match strip-pattern sofile)
+                                     'pre)))
+               (mkdir-p libdir)
+               (for-each (lambda (l)
+                           (copy-file
+                            l (string-append libdir "/" (basename l))))
+                         (find-files "bin" "lib*"))
+               (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\\..*")))
              #t)))))
     (home-page "http://astyle.sourceforge.net/";)
     (synopsis "Source code indenter, formatter, and beautifier")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]