[haiku-commits] haiku: hrev45105 - build/jam
- From: alex@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 29 Dec 2012 13:45:50 +0100 (CET)
hrev45105 adds 1 changeset to branch 'master'
old head: 48ec1c9d2277aed03b057fd13c9033fffe58a934
new head: 622506c4850173aae6356a4999a7a105f271d252
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=622506c+%5E48ec1c9
----------------------------------------------------------------------------
622506c: Added OpenSSH and Git optional packages for x86_64.
This commit is the first done from Haiku x86_64! Uncovered a few
networking bugs so hopefully this'll push OK... :)
[ Alex Smith <alex@xxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45105
Commit: 622506c4850173aae6356a4999a7a105f271d252
URL: http://cgit.haiku-os.org/haiku/commit/?id=622506c
Author: Alex Smith <alex@xxxxxxxxxxxxxxxx>
Date: Sat Dec 29 12:44:20 2012 UTC
----------------------------------------------------------------------------
1 file changed, 16 insertions(+), 7 deletions(-)
build/jam/OptionalPackages | 23 ++++++++++++++++-------
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index dff94f7..59bcdc6 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -1134,9 +1134,7 @@ if [ IsOptionalHaikuImagePackageAdded GetText ] {
# Git
if [ IsOptionalHaikuImagePackageAdded Git ] {
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package Git available for $(TARGET_ARCH)" ;
- } else {
+ if $(TARGET_ARCH) = x86 {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
git-1.7.10.2-r1a4-x86-gcc4-2012-08-30.zip
@@ -1148,6 +1146,13 @@ if [ IsOptionalHaikuImagePackageAdded Git ] {
:
$(baseURL)/git-1.7.10.2-r1a4-x86-gcc2-2012-08-28.zip
: : true ;
}
+ } else if $(TARGET_ARCH) = x86_64 {
+ InstallOptionalHaikuImagePackage
+ git-1.8.0-x86_64-2012-12-29.zip
+ : $(baseURL)/git-1.8.0-x86_64-2012-12-29.zip
+ : : true ;
+ } else {
+ Echo "No optional package Git available for $(TARGET_ARCH)" ;
}
}
@@ -1695,15 +1700,17 @@ if [ IsOptionalHaikuImagePackageAdded OpenSound ] {
# OpenSSH
if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package OpenSSH available for $(TARGET_ARCH)"
;
- } else {
+ if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
if ! $(HAIKU_IMAGE_HOST_NAME) && !
$(HAIKU_IGNORE_USER_BUILD_CONFIG) {
Exit "Optional package OpenSSH requires the
HAIKU_IMAGE_HOST_NAME"
"variable to be set!" ;
}
- if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ if $(TARGET_ARCH) = x86_64 {
+ InstallOptionalHaikuImagePackage
+ openssh-6.0p1-x86_64-2012-12-29.zip
+ :
$(baseURL)/openssh-6.0p1-x86_64-2012-12-29.zip ;
+ } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
openssh-6.0p1-r1a4-x86-gcc4-2012-09-29.zip
:
$(baseURL)/openssh-6.0p1-r1a4-x86-gcc4-2012-09-29.zip ;
@@ -1715,6 +1722,8 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] {
AddUserToHaikuImage sshd : 1001 : 100 : /var/empty : /bin/true
: "sshd user" ;
+ } else {
+ Echo "No optional package OpenSSH available for $(TARGET_ARCH)"
;
}
}
Other related posts:
- » [haiku-commits] haiku: hrev45105 - build/jam - alex
