[haiku-commits] haiku: hrev44741 - data/bin
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 3 Nov 2012 13:52:02 +0100 (CET)
hrev44741 adds 1 changeset to branch 'master'
old head: 114d994682cc424f40892b11cc567f9f47a3a0be
new head: 54391a5df206f617a4bf6e67fe5baf9c8b70a525
----------------------------------------------------------------------------
54391a5: 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: hrev44741
Commit: 54391a5df206f617a4bf6e67fe5baf9c8b70a525
URL: http://cgit.haiku-os.org/haiku/commit/?id=54391a5
Author: FranÃois Revol <revol@xxxxxxx>
Date: Sat Nov 3 12:37:27 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\ /''}
Other related posts:
- » [haiku-commits] haiku: hrev44741 - data/bin - revol
