[haiku-commits] haiku: hrev45924 - build/jam
- From: anevilyak@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 29 Jul 2013 04:57:38 +0200 (CEST)
hrev45924 adds 1 changeset to branch 'master'
old head: 998b880a6137204f53f1c7f9a57db77960d9670f
new head: e52af6a9e146b58b3a3bc522676d40b560e99a4c
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=e52af6a+%5E998b880
----------------------------------------------------------------------------
e52af6a: Add LibLayout and BePDF x86-64 packages.
Thanks to Chris Roberts for contributing the former.
[ Rene Gollent <anevilyak@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45924
Commit: e52af6a9e146b58b3a3bc522676d40b560e99a4c
URL: http://cgit.haiku-os.org/haiku/commit/?id=e52af6a
Author: Rene Gollent <anevilyak@xxxxxxxxx>
Date: Mon Jul 29 02:09:20 2013 UTC
----------------------------------------------------------------------------
1 file changed, 21 insertions(+), 10 deletions(-)
build/jam/OptionalPackages | 31 +++++++++++++++++++++----------
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 7bb06f9..28a8a10 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -295,9 +295,7 @@ if [ IsOptionalHaikuImagePackageAdded BeOSCompatibility ] {
# BePDF
if [ IsOptionalHaikuImagePackageAdded BePDF ] {
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package BePDF available for $(TARGET_ARCH)" ;
- } else {
+ if $(TARGET_ARCH) = x86 {
if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
bepdf-1.1.1b4-x86-gcc4-2012-08-11.zip
@@ -309,6 +307,14 @@ if [ IsOptionalHaikuImagePackageAdded BePDF ] {
}
AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/BePDF/BePDF ;
+ } else if $(TARGET_ARCH) = x86_64 {
+ InstallOptionalHaikuImagePackage
+ bepdf-1.1.1b4-x86_64-2013-07-28.zip
+ : $(baseURL)/bepdf-1.1.1b4-x86_64-2013-07-28.zip ;
+ AddSymlinkToHaikuImage home config settings deskbar Applications
+ : /boot/apps/BePDF/BePDF ;
+ } else {
+ Echo "No optional package BePDF available for $(TARGET_ARCH)" ;
}
}
@@ -1429,14 +1435,19 @@ if [ IsOptionalHaikuImagePackageAdded LibIconv ] {
# LibLayout library
if [ IsOptionalHaikuImagePackageAdded LibLayout ] {
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package LibLayout available for
$(TARGET_ARCH)" ;
- } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
- InstallOptionalHaikuImagePackage
liblayout-1.4.1-r1a4-x86-gcc4-2012-08-30.zip
- :
$(baseURL)/liblayout-1.4.1-r1a4-x86-gcc4-2012-08-30.zip ;
+ if $(TARGET_ARCH) = x86 {
+ if $(HAIKU_GCC_VERSION[1]) >= 4 {
+ InstallOptionalHaikuImagePackage
liblayout-1.4.1-r1a4-x86-gcc4-2012-08-30.zip
+ :
$(baseURL)/liblayout-1.4.1-r1a4-x86-gcc4-2012-08-30.zip ;
+ } else {
+ InstallOptionalHaikuImagePackage
liblayout-1.4.0-gcc2-2009-03-08.zip
+ :
$(baseURL)/liblayout-1.4.0-gcc2-2009-03-08.zip ;
+ }
+ } else if $(TARGET_ARCH) = x86_64 {
+ InstallOptionalHaikuImagePackage
liblayout-1.4.1-x86_64-2013-07-28.zip
+ :
$(baseURL)/liblayout-1.4.1-x86_64-2013-07-28.zip ;
} else {
- InstallOptionalHaikuImagePackage
liblayout-1.4.0-gcc2-2009-03-08.zip
- : $(baseURL)/liblayout-1.4.0-gcc2-2009-03-08.zip ;
+ Echo "No optional package LibLayout available for
$(TARGET_ARCH)" ;
}
}
Other related posts:
- » [haiku-commits] haiku: hrev45924 - build/jam - anevilyak
