hrevr1alpha4-44675 adds 1 changeset to branch 'r1alpha4' old head: e9733ff610eca28c110ae8a83f679dda0c0e2c0a new head: 417e920456268929ce3c8dbbd75208954db0d7eb ---------------------------------------------------------------------------- 417e920: Fix installoptionalpackage for OpenSSL and Webkit * The regex for the OpenSSL package name variable didn't catch up with the changed file which checked for the gcc version. * Webkit was declared using a custom variable that wasn't grepped for. [ FranÃois Revol <revol@xxxxxxx> ] ---------------------------------------------------------------------------- Revision: hrevr1alpha4-44675 Commit: 417e920456268929ce3c8dbbd75208954db0d7eb URL: http://cgit.haiku-os.org/haiku/commit/?id=417e920 Author: FranÃois Revol <revol@xxxxxxx> Date: Sat Nov 3 12:37:27 2012 UTC Committer: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> Commit-Date: Mon Nov 5 19:59:32 2012 UTC ---------------------------------------------------------------------------- 1 file changed, 6 insertions(+), 1 deletion(-) data/bin/installoptionalpackage | 7 ++++++- ---------------------------------------------------------------------------- diff --git a/data/bin/installoptionalpackage b/data/bin/installoptionalpackage index 612549f..bd8c40c 100755 --- a/data/bin/installoptionalpackage +++ b/data/bin/installoptionalpackage @@ -65,6 +65,7 @@ HAIKU_INCLUDE_SOURCES=0 $urlLine $sslPkgLine $sslUrlLine +$webkitFileLine declare -a functionArgs expanderRulesFile=`finddir B_COMMON_DATA_DIRECTORY`/expander.rules if [ -f \${expanderRulesFile} ] ; then @@ -686,7 +687,7 @@ function ConvertJamToBash() #icuDevelPkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures` #ConvertVariableDeclarationLines "$regExp" 'icuDevelPkgLine' - local regExp='/^HAIKU_OPENSSL_PACKAGE/p' + local regExp="/^\s*HAIKU_OPENSSL_PACKAGE = .*-gcc${HAIKU_GCC_VERSION[1]}-/p" sslPkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures` ConvertVariableDeclarationLines "$regExp" 'sslPkgLine' @@ -694,6 +695,10 @@ function ConvertJamToBash() sslUrlLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures` ConvertVariableDeclarationLines "$regExp" 'sslUrlLine' + local regExp='/^HAIKU_WEBKIT_FILE/p' + webkitFileLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures` + ConvertVariableDeclarationLines "$regExp" 'webkitFileLine' + local regExp='/^local\ baseURL/p' urlLine=`sed -n -e "$regExp" ${baseDir}/OptionalPackages` urlLine=${urlLine/local\ /''}