[haiku-commits] haiku: hrev54069 - build/jam

  • From: waddlesplash <waddlesplash@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 19 Apr 2020 20:22:02 -0400 (EDT)

hrev54069 adds 2 changesets to branch 'master'
old head: 30bd2c8c2930617419f62b71a72403d99fd61ee2
new head: ef78f1eda04d9a9397960a7d2be3ed89e2208f85
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=ef78f1eda04d+%5E30bd2c8c2930

----------------------------------------------------------------------------

7c2cc474360b: DefaultBuildProfiles: Remove "gcc" from default source packages.
  
  OptionalPackages will add its source package when shipping GCC itself.

ef78f1eda04d: Add gmp and mpfr to the regular image package set.
  
  GAWK is apparently built against them (do we really need that?)
  so we can't just ship them with the optional package set.

                              [ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]

----------------------------------------------------------------------------

2 files changed, 4 insertions(+), 5 deletions(-)
Jamfile                        | 7 ++++---
build/jam/DefaultBuildProfiles | 2 --

############################################################################

Commit:      7c2cc474360bb60ec9b5f95afd34248549f9cd68
URL:         https://git.haiku-os.org/haiku/commit/?id=7c2cc474360b
Author:      Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date:        Mon Apr 20 00:18:44 2020 UTC

DefaultBuildProfiles: Remove "gcc" from default source packages.

OptionalPackages will add its source package when shipping GCC itself.

----------------------------------------------------------------------------

diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles
index 8adb71d29c..72bf5dd63b 100644
--- a/build/jam/DefaultBuildProfiles
+++ b/build/jam/DefaultBuildProfiles
@@ -104,7 +104,6 @@ rule DefineDefaultBuildProfiles
                                bepdf
                                nano
                                p7zip
-                               gcc
                                ;
 
                        local architectureObject ;
@@ -154,7 +153,6 @@ rule DefineDefaultBuildProfiles
                        AddHaikuImageSourcePackages
                                nano
                                p7zip
-                               gcc
                                ;
 
                        AddOptionalHaikuImagePackages Development Git ;

############################################################################

Revision:    hrev54069
Commit:      ef78f1eda04d9a9397960a7d2be3ed89e2208f85
URL:         https://git.haiku-os.org/haiku/commit/?id=ef78f1eda04d
Author:      Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date:        Mon Apr 20 00:21:31 2020 UTC

Add gmp and mpfr to the regular image package set.

GAWK is apparently built against them (do we really need that?)
so we can't just ship them with the optional package set.

----------------------------------------------------------------------------

diff --git a/Jamfile b/Jamfile
index 1b92829781..93e04f4850 100644
--- a/Jamfile
+++ b/Jamfile
@@ -23,10 +23,10 @@ AddHaikuImageSystemPackages [ FFilterByBuildFeatures
        bash bc coreutils curl freetype icu libsolv zlib zstd
 
        regular_image @{
-               bzip2 diffutils expat ffmpeg findutils gawk glu grep gutenprint8
+               bzip2 diffutils expat ffmpeg findutils gawk gmp glu grep 
gutenprint8
                gzip
                lame less libedit libicns
-               mesa mesa_devel mesa_swpipe@!gcc2 mesa_swrast@gcc2
+               mesa mesa_devel mesa_swpipe@!gcc2 mesa_swrast@gcc2 mpfr
                netcat
                sed sharutils
                tar tcpdump unzip wget which zip
@@ -36,9 +36,10 @@ AddHaikuImageSourcePackages [ FFilterByBuildFeatures
        bash bc coreutils
 
        regular_image @{
-               expat ffmpeg findutils gawk grep gutenprint8
+               expat ffmpeg findutils gawk gmp grep gutenprint8
                gzip
                lame less libicns
+               mpfr
                sed sharutils
                tar wget which
        }@


Other related posts:

  • » [haiku-commits] haiku: hrev54069 - build/jam - waddlesplash