hrev51781 adds 3 changesets to branch 'master'
old head: 08a4536b1fbb0dab5af6e15ad326bf4870cb2fa0
new head: 43e75989a6cad0492d850e922a14e4e584ded13f
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=43e75989a6ca+%5E08a4536b1fbb
----------------------------------------------------------------------------
7e4c719dbb59: Fix x86 bootstrap on x86_gcc2.
1a77020df1e7: libutil: add hybrid support.
43e75989a6ca: libnetwork: link against the arch specific libbsd and libutil.
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 20 insertions(+), 13 deletions(-)
build/jam/repositories/HaikuPortsCross/x86_gcc2 | 12 ++++++------
src/kits/network/Jamfile | 3 ++-
src/libs/util/Jamfile | 18 ++++++++++++------
############################################################################
Commit: 7e4c719dbb59503110ba0ae87dbb009b2361876b
URL: http://cgit.haiku-os.org/haiku/commit/?id=7e4c719dbb59
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Tue Jan 30 12:52:15 2018 UTC
Fix x86 bootstrap on x86_gcc2.
----------------------------------------------------------------------------
diff --git a/build/jam/repositories/HaikuPortsCross/x86_gcc2
b/build/jam/repositories/HaikuPortsCross/x86_gcc2
index 6a6a06f274..251b029f62 100644
--- a/build/jam/repositories/HaikuPortsCross/x86_gcc2
+++ b/build/jam/repositories/HaikuPortsCross/x86_gcc2
@@ -9,11 +9,11 @@ BootstrapPackageRepository HaikuPortsCross
gcc_bootstrap-2.95.3_2014_08_03-1
gcc_bootstrap_syslibs_devel-2.95.3_2014_08_03-1
- secondary_x86_gcc2 @{
+ secondary_x86 @{
gcc_bootstrap_x86-5.4.0_2016_06_04-1
gcc_bootstrap_x86_syslibs-5.4.0_2016_06_04-1
gcc_bootstrap_x86_syslibs_devel-5.4.0_2016_06_04-1
- }@ # secondary_x86_gcc2
+ }@ # secondary_x86
:
# repository architecture packages (stage 1)
bash_bootstrap-4.4.012-1
@@ -49,10 +49,10 @@ BootstrapPackageRepository HaikuPortsCross
expat_bootstrap_x86_devel-2.1.0-1
freetype_bootstrap_x86-2.6.3-1
freetype_bootstrap_x86_devel-2.6.3-1
- icu_bootstrap_x86-4.8.1.1-1
- icu_bootstrap_x86_devel-4.8.1.1-1
- ncurses_bootstrap_x86-6.0-1
- ncurses_bootstrap_x86_devel-6.0-1
+ icu_bootstrap_x86-57.1-2
+ icu_bootstrap_x86_devel-57.1-2
+ ncurses6_bootstrap_x86-6.0-1
+ ncurses6_bootstrap_x86_devel-6.0-1
zlib_bootstrap_x86-1.2.11-1
zlib_bootstrap_x86_devel-1.2.11-1
}@ # secondary_x86
############################################################################
Commit: 1a77020df1e7334133cc06e2bb01f08affc024e9
URL: http://cgit.haiku-os.org/haiku/commit/?id=1a77020df1e7
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Tue Jan 30 15:43:25 2018 UTC
libutil: add hybrid support.
----------------------------------------------------------------------------
diff --git a/src/libs/util/Jamfile b/src/libs/util/Jamfile
index a497db85f1..d5f1f749ab 100644
--- a/src/libs/util/Jamfile
+++ b/src/libs/util/Jamfile
@@ -7,10 +7,16 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd
] : true ;
local defines = [ FDefines SCCSID=0 _BSD_SOURCE=1 ] ;
SubDirCcFlags $(defines) ;
-StaticLibrary libutil.a :
- fparseln.c
- pidfile.c
- realhostname.c
- trimdomain.c
-;
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+ on $(architectureObject) {
+ StaticLibrary [ MultiArchDefaultGristFiles libutil.a ] :
+ fparseln.c
+ pidfile.c
+ realhostname.c
+ trimdomain.c
+ ;
+
+ }
+}
############################################################################
Revision: hrev51781
Commit: 43e75989a6cad0492d850e922a14e4e584ded13f
URL: http://cgit.haiku-os.org/haiku/commit/?id=43e75989a6ca
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Tue Jan 30 15:43:40 2018 UTC
libnetwork: link against the arch specific libbsd and libutil.
----------------------------------------------------------------------------
diff --git a/src/kits/network/Jamfile b/src/kits/network/Jamfile
index 7260cdf9a8..046a9c7f27 100644
--- a/src/kits/network/Jamfile
+++ b/src/kits/network/Jamfile
@@ -24,7 +24,8 @@ for architectureObject in [ MultiArchSubDirSetup ] {
socket.cpp
r5_compatibility.cpp
:
- <netresolv!$(architecture)>netresolv.o libutil.a
libbsd.so
+ <netresolv!$(architecture)>netresolv.o
+ [ MultiArchDefaultGristFiles libutil.a libbsd.so ]
[ TargetLibsupc++ ]
;
