[haiku-commits] r39422 - haiku/branches/developer/bonefish/weak-symbols/build/jam
- From: ingo_weinhold@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 14 Nov 2010 01:37:32 +0100 (CET)
Author: bonefish
Date: 2010-11-14 01:37:32 +0100 (Sun, 14 Nov 2010)
New Revision: 39422
Changeset: http://dev.haiku-os.org/changeset/39422
Modified:
haiku/branches/developer/bonefish/weak-symbols/build/jam/OptionalPackages
Log:
Rebuilt gcc 4 packages for nano, p7zip, Pe, tar, vision, xz-utils. Only
WonderBrush and WebPositive missing for the release packages.
Modified:
haiku/branches/developer/bonefish/weak-symbols/build/jam/OptionalPackages
===================================================================
--- haiku/branches/developer/bonefish/weak-symbols/build/jam/OptionalPackages
2010-11-14 00:10:21 UTC (rev 39421)
+++ haiku/branches/developer/bonefish/weak-symbols/build/jam/OptionalPackages
2010-11-14 00:37:32 UTC (rev 39422)
@@ -1179,11 +1179,15 @@
if $(TARGET_ARCH) != x86 {
Echo "No optional package Nano available for $(TARGET_ARCH)" ;
} else {
- InstallOptionalHaikuImagePackage
- nano-2.2.5-x86-gcc2-2010-10-16.zip
- : $(baseURL)/nano-2.2.5-x86-gcc2-2010-10-16.zip
- :
- ;
+ if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
+ nano-2.2.5-x86-gcc4-2010-11-13.zip
+ : $(baseURL)/nano-2.2.5-x86-gcc4-2010-11-13.zip
;
+ } else {
+ InstallOptionalHaikuImagePackage
+ nano-2.2.5-x86-gcc2-2010-10-16.zip
+ : $(baseURL)/nano-2.2.5-x86-gcc2-2010-10-16.zip
;
+ }
}
}
@@ -1337,10 +1341,8 @@
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
- p7zip-9.04-r1a2-x86-gcc4-2010-05-06.zip
- :
$(baseURL)/p7zip-9.04-r1a2-x86-gcc4-2010-05-06.zip
- :
- ;
+ p7zip-9.04-x86-gcc4-2010-11-13.zip
+ : $(baseURL)/p7zip-9.04-x86-gcc4-2010-11-13.zip
;
} else {
InstallOptionalHaikuImagePackage
p7zip-9.04-x86-gcc2-2010-09-01.zip
@@ -1408,9 +1410,9 @@
Echo "No optional package Pe available for $(TARGET_ARCH)" ;
} else {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
pe-2.4.3-600-x86-gcc4-2010-09-28.zip
- :
$(baseURL)/pe-2.4.3-600-x86-gcc4-2010-09-28.zip
- ;
+ InstallOptionalHaikuImagePackage
+ pe-2.4.3-600-x86-gcc4-2010-11-14.zip
+ :
$(baseURL)/pe-2.4.3-600-x86-gcc4-2010-11-14.zip ;
} else {
InstallOptionalHaikuImagePackage
pe-2.4.3-600-x86-gcc2-2010-09-28.zip
@@ -1579,11 +1581,16 @@
if $(TARGET_ARCH) != x86 {
Echo "No optional package Tar available for $(TARGET_ARCH)" ;
} else {
- InstallOptionalHaikuImagePackage
- tar-1.22-r1a2-x86-gcc2-2010-04-22-a.zip
- : $(baseURL)/tar-1.22-r1a2-x86-gcc2-2010-04-22-a.zip
- :
- ;
+ if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+ InstallOptionalHaikuImagePackage
+ tar-1.22-x86-gcc4-2010-11-13.zip
+ : $(baseURL)/tar-1.22-x86-gcc4-2010-11-13.zip ;
+ } else {
+ InstallOptionalHaikuImagePackage
+ tar-1.22-r1a2-x86-gcc2-2010-04-22-a.zip
+ :
$(baseURL)/tar-1.22-r1a2-x86-gcc2-2010-04-22-a.zip ;
+ }
+
InstallSourceArchive tar-1.22_haiku-2010-04-29.tar.xz
: $(baseSourceURL)/tar-1.22_haiku-2010-04-29.tar.xz ;
}
@@ -1711,17 +1718,13 @@
if $(TARGET_ARCH) != x86 {
Echo "No optional package Vision available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
vision-908-x86-gcc2-2010-10-30.zip
- : $(baseURL)/vision-908-x86-gcc4-2010-11-04.zip
- :
- ;
+ InstallOptionalHaikuImagePackage
vision-908-x86-gcc4-2010-11-14.zip
+ : $(baseURL)/vision-908-x86-gcc4-2010-11-14.zip ;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/Vision/Vision ;
} else {
InstallOptionalHaikuImagePackage
vision-908-x86-gcc2-2010-10-30.zip
- : $(baseURL)/vision-908-x86-gcc2-2010-10-30.zip
- :
- ;
+ : $(baseURL)/vision-908-x86-gcc2-2010-10-30.zip ;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/Vision/Vision ;
}
@@ -1849,13 +1852,16 @@
if $(TARGET_ARCH) != x86 {
Echo "No optional package XZ-Utils available for
$(TARGET_ARCH)" ;
} else {
- InstallOptionalHaikuImagePackage
- xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25-a.zip
- :
$(baseURL)/xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25-a.zip
- :
- :
- : true
- ;
+ if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
+ xz-utils-4.999.9-x86-gcc4-2010-11-13.zip
+ :
$(baseURL)/xz-utils-4.999.9-x86-gcc4-2010-11-13.zip ;
+ } else {
+ InstallOptionalHaikuImagePackage
+ xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25-a.zip
+ :
$(baseURL)/xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25-a.zip ;
+ }
+
InstallSourceArchive xz-utils-4.999.9_haiku-2010-04-29.tar.xz
:
$(baseSourceURL)/xz-utils-4.999.9_haiku-2010-04-29.tar.xz ;
AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz
Other related posts:
