GNU bug report logs - #38090
[PATCH 0/2] Fix build for astyle

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 38090 in the body.
You can then email your comments to 38090 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/2] Fix build for astyle
Date: Wed,  6 Nov 2019 17:39:42 +0100

- header files have been missing
- 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.)

I stepped over these when updating kdevelop.

Hartmut Goebel (2):
  gnu: astyle: Install header file, too.
  gnu: astyle: Create symlinks for .so files, too.

 gnu/packages/code.scm | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

-- 
2.21.0

Message #8 received at 38090 <at> debbugs.gnu.org (full text, mbox):

From: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
To: 38090 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: astyle: Install header file, too.
Date: Wed,  6 Nov 2019 17:40:37 +0100

* gnu/packages/code.scm(astyle)[arguments]<phases>{install-libs}: Also install
  header file.
---
 gnu/packages/code.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index 512ca5d365..d1c3540bd4 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2014 Eric Bavier <bavier <at> member.fsf.org>
 ;;; Copyright © 2013 Andreas Enge <andreas <at> enge.fr>
 ;;; Copyright © 2014 Mark H Weaver <mhw <at> netris.org>
+;;; Copyright © 2019 Hartmut Goebel <h.goebel <at> goebel-consult.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -605,10 +606,14 @@ Objective <at> tie{}C, D, Java, Pawn, and Vala).  Features:
            (lambda _ (chdir "build/gcc") #t))
          (add-after 'install 'install-libs
            (lambda* (#:key outputs #:allow-other-keys)
-             ;; Libraries are not installed by default
+             ;; Libraries and includes are not installed by default
              (let* ((output (assoc-ref outputs "out"))
+                    (incdir (string-append output "/include"))
                     (libdir (string-append output "/lib")))
                (begin
+                 (mkdir-p incdir)
+                 (copy-file "../../src/astyle.h"
+                            (string-append incdir "/astyle.h"))
                  (mkdir-p libdir)
                  (for-each (lambda (l)
                              (copy-file
-- 
2.21.0

Message #11 received at 38090 <at> debbugs.gnu.org (full text, mbox):

From: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
To: 38090 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: astyle: Create symlinks for .so files, too.
Date: Wed,  6 Nov 2019 17:40:38 +0100

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.)

* gnu/packages/code.scm(astyle)[argumements]<modules>: New element.
  <phases>{install-libs}: Add creating symlinks.
---
 gnu/packages/code.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index d1c3540bd4..9aa5bb3bec 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -600,6 +600,9 @@ Objective <at> 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
@@ -618,7 +621,14 @@ Objective <at> tie{}C, D, Java, Pawn, and Vala).  Features:
                  (for-each (lambda (l)
                              (copy-file
                               l (string-append libdir "/" (basename l))))
-                           (find-files "bin" "lib*"))))
+                           (find-files "bin" "lib*"))
+                 (for-each
+                  (lambda (l)
+                    (symlink (basename l)
+                     (regexp-substitute #f
+                                        (string-match "(\\.[0-9]){3}$" l)
+                                        'pre)))
+                  (find-files libdir "lib.*\\.so\\..*"))))
              #t)))))
     (home-page "http://astyle.sourceforge.net/")
     (synopsis "Source code indenter, formatter, and beautifier")
-- 
2.21.0

Message #16 received at 38090-close <at> debbugs.gnu.org (full text, mbox):

From: Hartmut Goebel <h.goebel <at> crazy-compilers.com>
To: 38090-close <at> debbugs.gnu.org
Subject: Re: bug#38090: Acknowledgement ([PATCH 0/2] Fix build for astyle)
Date: Wed, 6 Nov 2019 22:24:52 +0100

This showed to be not sufficient. Will send a new patch set soon.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel <at> crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.