From a3fe9a1432170c0c82ce509522e6886fcce0ce37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Sun, 8 Mar 2009 23:35:08 +0000 Subject: [PATCH] Added Liblayout optional package. It just installs the library and the headers in the right places (/boot/common). I made it depend on the Development package, since without it it wouldn't be useful. It also refuses to install on a GCC4 based Haiku, since it's intended to help building some popular BeOS/Haiku software, and there you couldn't link against GCC2 libs I suppose when you have GCC4 development tools. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29451 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 4380400ae9..5e254ad19d 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -22,6 +22,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) { # CVS # Development # Firefox +# LibLayout # Links # NetSurf # OpenSound @@ -43,6 +44,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) { OptionalPackageDependencies APR-util : APR ; OptionalPackageDependencies BeHappy : BeBook NetSurf ; OptionalPackageDependencies Development : Perl ; +OptionalPackageDependencies LibLayout : Development ; OptionalPackageDependencies NetSurf : OpenSSL ; OptionalPackageDependencies OpenSSH : OpenSSL ; OptionalPackageDependencies Subversion : OpenSSL ; @@ -301,6 +303,22 @@ if [ IsOptionalHaikuImagePackageAdded Firefox ] { } +# 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 { + Echo "No optional package LibLayout available for gcc4" ; + } else { + local baseURL = http://haiku-files.org/files/optional-packages ; + InstallOptionalHaikuImagePackage liblayout-1.4.0-gcc2-2009-03-08 + : $(baseURL)/liblayout-1.4.0-gcc2-2009-03-08.zip + : + ; + } +} + + # Links web browser if [ IsOptionalHaikuImagePackageAdded Links ] { if $(TARGET_ARCH) != x86 {