hrev51778 adds 2 changesets to branch 'master'
old head: 80a272eed817288ae41b91444ae524da57d7c43c
new head: c676a5c19ed3bfffd196b29800aa5ad3909ba8d7
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=c676a5c19ed3+%5E80a272eed817
----------------------------------------------------------------------------
86ae71e8ee79: bootstrap: add missing curl and less packages for x86_gcc2.
c676a5c19ed3: Make the Haiku package not depends on noto_sans_cjk_jp ...
except for regular builds.
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
7 files changed, 17 insertions(+)
build/jam/repositories/HaikuPortsCross/x86_gcc2 | 5 +++++
src/data/package_infos/arm/haiku | 2 ++
src/data/package_infos/m68k/haiku | 2 ++
src/data/package_infos/ppc/haiku | 2 ++
src/data/package_infos/x86/haiku | 2 ++
src/data/package_infos/x86_64/haiku | 2 ++
src/data/package_infos/x86_gcc2/haiku | 2 ++
############################################################################
Commit: 86ae71e8ee798c6dddba5a0ef347c8068f4a2920
URL: http://cgit.haiku-os.org/haiku/commit/?id=86ae71e8ee79
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Mon Jan 29 14:53:37 2018 UTC
bootstrap: add missing curl and less packages for x86_gcc2.
----------------------------------------------------------------------------
diff --git a/build/jam/repositories/HaikuPortsCross/x86_gcc2
b/build/jam/repositories/HaikuPortsCross/x86_gcc2
index 6054a00e0f..6a6a06f274 100644
--- a/build/jam/repositories/HaikuPortsCross/x86_gcc2
+++ b/build/jam/repositories/HaikuPortsCross/x86_gcc2
@@ -20,6 +20,8 @@ BootstrapPackageRepository HaikuPortsCross
binutils_bootstrap-2.17_2013_04_21-3
bison_bootstrap-2.4.3-1
coreutils_bootstrap-8.22-1
+ curl_bootstrap-7.40.0-1
+ curl_bootstrap_devel-7.40.0-1
expat_bootstrap-2.1.0-1
expat_bootstrap_devel-2.1.0-1
findutils_bootstrap-4.6.0-1
@@ -30,6 +32,7 @@ BootstrapPackageRepository HaikuPortsCross
grep_bootstrap-2.14-1
icu_bootstrap-57.1-2
icu_bootstrap_devel-57.1-2
+ less_bootstrap-451-1
m4_bootstrap-1.4.16-1
make_bootstrap-4.1-2
ncurses6_bootstrap-6.0-1
@@ -68,6 +71,7 @@ BootstrapPackageRepository HaikuPortsCross
binutils_bootstrap
bison_bootstrap
coreutils_bootstrap
+ curl_bootstrap
expat_bootstrap
findutils_bootstrap
flex_bootstrap
@@ -75,6 +79,7 @@ BootstrapPackageRepository HaikuPortsCross
gawk_bootstrap
gcc_bootstrap
grep_bootstrap
+ less_bootstrap
libsolv_bootstrap
m4_bootstrap
make_bootstrap
############################################################################
Revision: hrev51778
Commit: c676a5c19ed3bfffd196b29800aa5ad3909ba8d7
URL: http://cgit.haiku-os.org/haiku/commit/?id=c676a5c19ed3
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Mon Jan 29 14:56:07 2018 UTC
Make the Haiku package not depends on noto_sans_cjk_jp ...
except for regular builds.
----------------------------------------------------------------------------
diff --git a/src/data/package_infos/arm/haiku b/src/data/package_infos/arm/haiku
index 9ef5bde0ce..70ccea1406 100644
--- a/src/data/package_infos/arm/haiku
+++ b/src/data/package_infos/arm/haiku
@@ -81,5 +81,7 @@ requires {
lib:libsupc++
lib:libz
noto
+#ifdef HAIKU_REGULAR_BUILD
noto_sans_cjk_jp
+#endif
}
diff --git a/src/data/package_infos/m68k/haiku
b/src/data/package_infos/m68k/haiku
index a29c39969f..779e10c15d 100644
--- a/src/data/package_infos/m68k/haiku
+++ b/src/data/package_infos/m68k/haiku
@@ -72,5 +72,7 @@ requires {
lib:libsupc++
lib:libz
noto
+#ifdef HAIKU_REGULAR_BUILD
noto_sans_cjk_jp
+#endif
}
diff --git a/src/data/package_infos/ppc/haiku b/src/data/package_infos/ppc/haiku
index f3c698ae9c..fcd950c88c 100644
--- a/src/data/package_infos/ppc/haiku
+++ b/src/data/package_infos/ppc/haiku
@@ -81,5 +81,7 @@ requires {
lib:libsupc++
lib:libz
noto
+#ifdef HAIKU_REGULAR_BUILD
noto_sans_cjk_jp
+#endif
}
diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku
index cb7cba43ff..27248efbb0 100644
--- a/src/data/package_infos/x86/haiku
+++ b/src/data/package_infos/x86/haiku
@@ -134,5 +134,7 @@ requires {
lib:libsupc++
lib:libz
noto
+#ifdef HAIKU_REGULAR_BUILD
noto_sans_cjk_jp
+#endif
}
diff --git a/src/data/package_infos/x86_64/haiku
b/src/data/package_infos/x86_64/haiku
index ab3de208f6..6232e57738 100644
--- a/src/data/package_infos/x86_64/haiku
+++ b/src/data/package_infos/x86_64/haiku
@@ -133,5 +133,7 @@ requires {
lib:libsupc++
lib:libz
noto
+#ifdef HAIKU_REGULAR_BUILD
noto_sans_cjk_jp
+#endif
}
diff --git a/src/data/package_infos/x86_gcc2/haiku
b/src/data/package_infos/x86_gcc2/haiku
index 223067e8d7..e811025cd0 100644
--- a/src/data/package_infos/x86_gcc2/haiku
+++ b/src/data/package_infos/x86_gcc2/haiku
@@ -122,5 +122,7 @@ requires {
lib:libsolvext
lib:libz
noto
+#ifdef HAIKU_REGULAR_BUILD
noto_sans_cjk_jp
+#endif
}
