diff mbox

gnu: boost: Allow for customizable build flags.

Message ID 20160613130808.20143-1-dthompson2@worcester.edu
State New
Headers show

Commit Message

David Thompson June 13, 2016, 1:08 p.m. UTC
From: David Thompson <davet@gnu.org>

* gnu/packages/boost.scm (boost)[arguments]: Extract build flags to #:make-flags argument.
---
 gnu/packages/boost.scm | 80 +++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

Comments

Ricardo Wurmus June 14, 2016, 10:54 a.m. UTC | #1
David Thompson <dthompson2@worcester.edu> writes:

> From: David Thompson <davet@gnu.org>
>
> * gnu/packages/boost.scm (boost)[arguments]: Extract build flags to #:make-flags argument.

If I understand correctly, this moves the let-bound “build-flags” to
regular make-flags and reuses the default mechanism for passing
make-flags, right?

If this is so it looks good to me.

(It’s a little hard for me to read the patch because of the indentation
change.)

~~ Ricardo


>  gnu/packages/boost.scm | 80 +++++++++++++++++++++++++-------------------------
>  1 file changed, 40 insertions(+), 40 deletions(-)
>
> diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
> index 0a644e8..882f9cc 100644
> --- a/gnu/packages/boost.scm
> +++ b/gnu/packages/boost.scm
> @@ -51,50 +51,50 @@
>         ("python" ,python-2)
>         ("tcsh" ,tcsh)))
>      (arguments
> -     (let ((build-flags
> -            `("threading=multi" "link=shared"
> +     `(#:tests? #f
> +       #:make-flags
> +       (list "threading=multi" "link=shared"
>  
> -              ;; Set the RUNPATH to $libdir so that the libs find each other.
> -              (string-append "linkflags=-Wl,-rpath="
> -                             (assoc-ref outputs "out") "/lib")
> +             ;; Set the RUNPATH to $libdir so that the libs find each other.
> +             (string-append "linkflags=-Wl,-rpath="
> +                            (assoc-ref %outputs "out") "/lib")
>  
> -              ;; Boost's 'context' library is not yet supported on mips64, so
> -              ;; we disable it.  The 'coroutine' library depends on 'context',
> -              ;; so we disable that too.
> -              ,@(if (string-prefix? "mips64" (or (%current-target-system)
> -                                                 (%current-system)))
> -                    '("--without-context"
> -                      "--without-coroutine" "--without-coroutine2")
> -                    '()))))
> -       `(#:tests? #f
> -         #:phases
> -         (modify-phases %standard-phases
> -           (replace
> -            'configure
> -            (lambda* (#:key outputs #:allow-other-keys)
> -              (let ((out (assoc-ref outputs "out")))
> -                (substitute* '("libs/config/configure"
> -                               "libs/spirit/classic/phoenix/test/runtest.sh"
> -                               "tools/build/doc/bjam.qbk"
> -                               "tools/build/src/engine/execunix.c"
> -                               "tools/build/src/engine/Jambase"
> -                               "tools/build/src/engine/jambase.c")
> -                  (("/bin/sh") (which "sh")))
> +             ;; Boost's 'context' library is not yet supported on mips64, so
> +             ;; we disable it.  The 'coroutine' library depends on 'context',
> +             ;; so we disable that too.
> +             ,@(if (string-prefix? "mips64" (or (%current-target-system)
> +                                                (%current-system)))
> +                   '("--without-context"
> +                     "--without-coroutine" "--without-coroutine2")
> +                   '()))
> +       #:phases
> +       (modify-phases %standard-phases
> +         (replace
> +             'configure
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let ((out (assoc-ref outputs "out")))
> +               (substitute* '("libs/config/configure"
> +                              "libs/spirit/classic/phoenix/test/runtest.sh"
> +                              "tools/build/doc/bjam.qbk"
> +                              "tools/build/src/engine/execunix.c"
> +                              "tools/build/src/engine/Jambase"
> +                              "tools/build/src/engine/jambase.c")
> +                 (("/bin/sh") (which "sh")))
>  
> -                (setenv "SHELL" (which "sh"))
> -                (setenv "CONFIG_SHELL" (which "sh"))
> +               (setenv "SHELL" (which "sh"))
> +               (setenv "CONFIG_SHELL" (which "sh"))
>  
> -                (zero? (system* "./bootstrap.sh"
> -                                (string-append "--prefix=" out)
> -                                "--with-toolset=gcc")))))
> -           (replace
> -            'build
> -            (lambda* (#:key outputs #:allow-other-keys)
> -              (zero? (system* "./b2" ,@build-flags))))
> -           (replace
> -            'install
> -            (lambda* (#:key outputs #:allow-other-keys)
> -              (zero? (system* "./b2" "install" ,@build-flags))))))))
> +               (zero? (system* "./bootstrap.sh"
> +                               (string-append "--prefix=" out)
> +                               "--with-toolset=gcc")))))
> +         (replace
> +             'build
> +           (lambda* (#:key outputs make-flags #:allow-other-keys)
> +             (zero? (apply system* "./b2" make-flags))))
> +         (replace
> +             'install
> +           (lambda* (#:key outputs make-flags #:allow-other-keys)
> +             (zero? (apply system* "./b2" "install" make-flags)))))))
>  
>      (home-page "http://boost.org")
>      (synopsis "Peer-reviewed portable C++ source libraries")
David Thompson June 14, 2016, 11:41 a.m. UTC | #2
On Tue, Jun 14, 2016 at 6:54 AM, Ricardo Wurmus
<ricardo.wurmus@mdc-berlin.de> wrote:
>
> David Thompson <dthompson2@worcester.edu> writes:
>
>> From: David Thompson <davet@gnu.org>
>>
>> * gnu/packages/boost.scm (boost)[arguments]: Extract build flags to #:make-flags argument.
>
> If I understand correctly, this moves the let-bound “build-flags” to
> regular make-flags and reuses the default mechanism for passing
> make-flags, right?

Yes, exactly.  With it I can easily create things like a statically
linked variant.

~283 packages will need to rebuilt with this change, so maybe
core-updates would be a good place to put this?  Or would it be
core-updates-next?  I'm not sure anymore. :)

Thanks!

- Dave
Efraim Flashner June 14, 2016, 11:53 a.m. UTC | #3
On Tue, Jun 14, 2016 at 07:41:31AM -0400, Thompson, David wrote:
> On Tue, Jun 14, 2016 at 6:54 AM, Ricardo Wurmus
> <ricardo.wurmus@mdc-berlin.de> wrote:
> >
> > David Thompson <dthompson2@worcester.edu> writes:
> >
> >> From: David Thompson <davet@gnu.org>
> >>
> >> * gnu/packages/boost.scm (boost)[arguments]: Extract build flags to #:make-flags argument.
> >
> > If I understand correctly, this moves the let-bound “build-flags” to
> > regular make-flags and reuses the default mechanism for passing
> > make-flags, right?
> 
> Yes, exactly.  With it I can easily create things like a statically
> linked variant.
> 
> ~283 packages will need to rebuilt with this change, so maybe
> core-updates would be a good place to put this?  Or would it be
> core-updates-next?  I'm not sure anymore. :)
> 
> Thanks!
> 
> - Dave
> 

I would toss it into core-updates and hope Ludo doesn't notice :). I don't
think it's quite reached building out that far yet so it should be ok.
Ludovic Courtès June 14, 2016, 12:04 p.m. UTC | #4
"Thompson, David" <dthompson2@worcester.edu> skribis:

> On Tue, Jun 14, 2016 at 6:54 AM, Ricardo Wurmus
> <ricardo.wurmus@mdc-berlin.de> wrote:
>>
>> David Thompson <dthompson2@worcester.edu> writes:
>>
>>> From: David Thompson <davet@gnu.org>
>>>
>>> * gnu/packages/boost.scm (boost)[arguments]: Extract build flags to #:make-flags argument.
>>
>> If I understand correctly, this moves the let-bound “build-flags” to
>> regular make-flags and reuses the default mechanism for passing
>> make-flags, right?
>
> Yes, exactly.  With it I can easily create things like a statically
> linked variant.
>
> ~283 packages will need to rebuilt with this change, so maybe
> core-updates would be a good place to put this?  Or would it be
> core-updates-next?  I'm not sure anymore. :)

Heh, I think we need a PhD student to work on the scheduling of changes
in the package DAG (seriously, I think that’d be a real topic!).

Please apply to ‘core-updates’ and we’ll get it built.

Thanks!

Ludo’.
David Thompson June 14, 2016, 12:52 p.m. UTC | #5
On Tue, Jun 14, 2016 at 8:04 AM, Ludovic Courtès <ludo@gnu.org> wrote:
> "Thompson, David" <dthompson2@worcester.edu> skribis:
>
>> On Tue, Jun 14, 2016 at 6:54 AM, Ricardo Wurmus
>> <ricardo.wurmus@mdc-berlin.de> wrote:
>>>
>>> David Thompson <dthompson2@worcester.edu> writes:
>>>
>>>> From: David Thompson <davet@gnu.org>
>>>>
>>>> * gnu/packages/boost.scm (boost)[arguments]: Extract build flags to #:make-flags argument.
>>>
>>> If I understand correctly, this moves the let-bound “build-flags” to
>>> regular make-flags and reuses the default mechanism for passing
>>> make-flags, right?
>>
>> Yes, exactly.  With it I can easily create things like a statically
>> linked variant.
>>
>> ~283 packages will need to rebuilt with this change, so maybe
>> core-updates would be a good place to put this?  Or would it be
>> core-updates-next?  I'm not sure anymore. :)
>
> Heh, I think we need a PhD student to work on the scheduling of changes
> in the package DAG (seriously, I think that’d be a real topic!).

There certainly are some subtleties. ;)

> Please apply to ‘core-updates’ and we’ll get it built.

Done, thanks!

- Dave
diff mbox

Patch

diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index 0a644e8..882f9cc 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -51,50 +51,50 @@ 
        ("python" ,python-2)
        ("tcsh" ,tcsh)))
     (arguments
-     (let ((build-flags
-            `("threading=multi" "link=shared"
+     `(#:tests? #f
+       #:make-flags
+       (list "threading=multi" "link=shared"
 
-              ;; Set the RUNPATH to $libdir so that the libs find each other.
-              (string-append "linkflags=-Wl,-rpath="
-                             (assoc-ref outputs "out") "/lib")
+             ;; Set the RUNPATH to $libdir so that the libs find each other.
+             (string-append "linkflags=-Wl,-rpath="
+                            (assoc-ref %outputs "out") "/lib")
 
-              ;; Boost's 'context' library is not yet supported on mips64, so
-              ;; we disable it.  The 'coroutine' library depends on 'context',
-              ;; so we disable that too.
-              ,@(if (string-prefix? "mips64" (or (%current-target-system)
-                                                 (%current-system)))
-                    '("--without-context"
-                      "--without-coroutine" "--without-coroutine2")
-                    '()))))
-       `(#:tests? #f
-         #:phases
-         (modify-phases %standard-phases
-           (replace
-            'configure
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let ((out (assoc-ref outputs "out")))
-                (substitute* '("libs/config/configure"
-                               "libs/spirit/classic/phoenix/test/runtest.sh"
-                               "tools/build/doc/bjam.qbk"
-                               "tools/build/src/engine/execunix.c"
-                               "tools/build/src/engine/Jambase"
-                               "tools/build/src/engine/jambase.c")
-                  (("/bin/sh") (which "sh")))
+             ;; Boost's 'context' library is not yet supported on mips64, so
+             ;; we disable it.  The 'coroutine' library depends on 'context',
+             ;; so we disable that too.
+             ,@(if (string-prefix? "mips64" (or (%current-target-system)
+                                                (%current-system)))
+                   '("--without-context"
+                     "--without-coroutine" "--without-coroutine2")
+                   '()))
+       #:phases
+       (modify-phases %standard-phases
+         (replace
+             'configure
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (substitute* '("libs/config/configure"
+                              "libs/spirit/classic/phoenix/test/runtest.sh"
+                              "tools/build/doc/bjam.qbk"
+                              "tools/build/src/engine/execunix.c"
+                              "tools/build/src/engine/Jambase"
+                              "tools/build/src/engine/jambase.c")
+                 (("/bin/sh") (which "sh")))
 
-                (setenv "SHELL" (which "sh"))
-                (setenv "CONFIG_SHELL" (which "sh"))
+               (setenv "SHELL" (which "sh"))
+               (setenv "CONFIG_SHELL" (which "sh"))
 
-                (zero? (system* "./bootstrap.sh"
-                                (string-append "--prefix=" out)
-                                "--with-toolset=gcc")))))
-           (replace
-            'build
-            (lambda* (#:key outputs #:allow-other-keys)
-              (zero? (system* "./b2" ,@build-flags))))
-           (replace
-            'install
-            (lambda* (#:key outputs #:allow-other-keys)
-              (zero? (system* "./b2" "install" ,@build-flags))))))))
+               (zero? (system* "./bootstrap.sh"
+                               (string-append "--prefix=" out)
+                               "--with-toolset=gcc")))))
+         (replace
+             'build
+           (lambda* (#:key outputs make-flags #:allow-other-keys)
+             (zero? (apply system* "./b2" make-flags))))
+         (replace
+             'install
+           (lambda* (#:key outputs make-flags #:allow-other-keys)
+             (zero? (apply system* "./b2" "install" make-flags)))))))
 
     (home-page "http://boost.org")
     (synopsis "Peer-reviewed portable C++ source libraries")