i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix installoptionalpackage for OpenSSL and Webkit

Browse Source 
* 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.
This commit is contained in:
François Revol
2012-11-03 13:41:04 +01:00
parent 114d994682
commit 54391a5df2
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/bin/installoptionalpackage
+6 -1
View File
@@ -65,6 +65,7 @@ HAIKU_INCLUDE_SOURCES=0
$urlLine $urlLine
$sslPkgLine $sslPkgLine
$sslUrlLine $sslUrlLine
$webkitFileLine
declare -a functionArgs declare -a functionArgs
expanderRulesFile=`finddir B_COMMON_DATA_DIRECTORY`/expander.rules expanderRulesFile=`finddir B_COMMON_DATA_DIRECTORY`/expander.rules
if [ -f \${expanderRulesFile} ] ; then if [ -f \${expanderRulesFile} ] ; then
@@ -686,7 +687,7 @@ function ConvertJamToBash()
#icuDevelPkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures` #icuDevelPkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
#ConvertVariableDeclarationLines "$regExp" 'icuDevelPkgLine' #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` sslPkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
ConvertVariableDeclarationLines "$regExp" 'sslPkgLine' ConvertVariableDeclarationLines "$regExp" 'sslPkgLine'
@@ -694,6 +695,10 @@ function ConvertJamToBash()
sslUrlLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures` sslUrlLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
ConvertVariableDeclarationLines "$regExp" 'sslUrlLine' ConvertVariableDeclarationLines "$regExp" 'sslUrlLine'
local regExp='/^HAIKU_WEBKIT_FILE/p'
webkitFileLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
ConvertVariableDeclarationLines "$regExp" 'webkitFileLine'
local regExp='/^local\ baseURL/p' local regExp='/^local\ baseURL/p'
urlLine=`sed -n -e "$regExp" ${baseDir}/OptionalPackages` urlLine=`sed -n -e "$regExp" ${baseDir}/OptionalPackages`
urlLine=${urlLine/local\ /''} urlLine=${urlLine/local\ /''}