diff options
| author | Oliver Tappe <zooey@hirschkaefer.de> | 2009-09-30 19:06:36 (GMT) |
|---|---|---|
| committer | Oliver Tappe <zooey@hirschkaefer.de> | 2009-09-30 19:06:36 (GMT) |
| commit | d09525c9a1d1971ec3ab6c076f812110d56f9294 (patch) | |
| tree | 020540608e7a6faf38d1e9c4545a4c61f1ed2c9e | |
| parent | 7cb2cbf17b7bfc8036d5d93af0451d8668b889a9 (diff) | |
* added new optional package PCRE (for both gcc2 andhrev33373
gcc4 as it contains C++)
* fixed Beam dependencies to specify PCRE directly
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33373 a95241bf-73f2-0310-859d-f6bbb57e9c96
| -rw-r--r-- | build/jam/OptionalPackageDependencies | 2 | ||||
| -rw-r--r-- | build/jam/OptionalPackages | 29 |
2 files changed, 25 insertions, 6 deletions
diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies index cb6cc3f..f91a716 100644 --- a/build/jam/OptionalPackageDependencies +++ b/build/jam/OptionalPackageDependencies @@ -5,7 +5,7 @@ OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 OpenSSL SQLite ; OptionalPackageDependencies APR-util : APR Expat ; -OptionalPackageDependencies Beam : LibIconv LibLayout OpenSSL Pe ; # FIXME: Pe for PCRE-libs +OptionalPackageDependencies Beam : LibIconv LibLayout OpenSSL PCRE ; OptionalPackageDependencies BeHappy : BeBook NetSurf ; OptionalPackageDependencies Development : DevelopmentBase Perl ; OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 429659b..5e3a156 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -45,6 +45,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) { # OpenSSH - the secure shell # OpenSSL - secure sockets library # P7zip - file archiving utility +# PCRE - the (Perl-compatible) regex engine # Pe - the powerful native Programmer's Editor # Perl - the scripting language # Python - the scripting language @@ -712,6 +713,29 @@ if [ IsOptionalHaikuImagePackageAdded P7zip ] { } +# PCRE regex engine +if [ IsOptionalHaikuImagePackageAdded PCRE ] { + if $(TARGET_ARCH) != x86 { + Echo "No optional package PCRE available for $(TARGET_ARCH)" ; + } else { + if $(HAIKU_GCC_VERSION[1]) >= 4 { + InstallOptionalHaikuImagePackage pcre-7.9-x86-gcc4-2009-09-30 + : $(baseURL)/pcre-7.9-x86-gcc4-2009-09-30.zip + ; + } else { + InstallOptionalHaikuImagePackage pcre-7.9-x86-gcc2-2009-09-30 + : $(baseURL)/pcre-7.9-x86-gcc2-2009-09-30.zip + ; + } + + AddSymlinkToHaikuImage home config be Applications + : /boot/apps/Pe/Pe ; + AddSymlinkToHaikuImage common bin + : /boot/apps/Pe/lpe ; + } +} + + # Pe text editor if [ IsOptionalHaikuImagePackageAdded Pe ] { if $(TARGET_ARCH) != x86 { @@ -726,11 +750,6 @@ if [ IsOptionalHaikuImagePackageAdded Pe ] { : $(baseURL)/Pe-2.4.2-r593-r1a1-x86-gcc2-2009-09-08.zip ; } - - AddSymlinkToHaikuImage home config be Applications - : /boot/apps/Pe/Pe ; - AddSymlinkToHaikuImage common bin - : /boot/apps/Pe/lpe ; } } |