haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

sed: drop commandSuffix, simplify PROVIDES.

Browse Source 
This neutral change means that sed_x86 no longer exists on x86_64
hybrid. sed_x86 now only exists for x86_gcc2 hybrid.

FWIW, the CONFLICTS in sed_x86 is required to prevent, on x86_gcc2
hybrid, the co-installation of sed_x86 4.4 (or 4.5) with sed 4.2.1.
This commit is contained in:
fbrosson
2018-09-28 11:55:41 +00:00
parent 8f6db35379
commit f36da4c5b0
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sys-apps/sed/sed-4.4.recipe
View File

@@ -15,23 +15,23 @@ CHECKSUM_SHA256="cbd6ebc5aaf080ed60d0162d7f6aeae58211a1ee9ba9bb25623daa6cd942683
PATCHES="sed-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm"
if [ "$targetArchitecture" = x86_gcc2 ]; then
SECONDARY_ARCHITECTURES="x86"
fi
commandSuffix=$secondaryArchSuffix
commandBinDir=$binDir
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandSuffix=
commandBinDir=$prefix/bin
fi
PROVIDES="
sed$secondaryArchSuffix = $portVersion compat >= 4
cmd:sed$commandSuffix = $portVersion compat >= 4
cmd:sed = $portVersion compat >= 4
"
REQUIRES="
haiku$secondaryArchSuffix
"
if [ -n "$secondaryArchSuffix" -a -z "$commandSuffix" ]; then
if [ -n "$secondaryArchSuffix" ]; then
CONFLICTS="
sed
"
@@ -67,8 +67,8 @@ BUILD()
INSTALL()
{
make install
rm $libDir/charset.alias
rmdir $libDir
rm "$libDir"/charset.alias
rmdir "$libDir"
}
TEST()

8
sys-apps/sed/sed-4.5.recipe
View File

@@ -15,23 +15,23 @@ CHECKSUM_SHA256="7aad73c8839c2bdadca9476f884d2953cdace9567ecd0d90f9959f229d146b4
PATCHES="sed-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64 ?arm"
if [ "$targetArchitecture" = x86_gcc2 ]; then
SECONDARY_ARCHITECTURES="?x86"
fi
commandSuffix=$secondaryArchSuffix
commandBinDir=$binDir
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandSuffix=
commandBinDir=$prefix/bin
fi
PROVIDES="
sed$secondaryArchSuffix = $portVersion compat >= 4
cmd:sed$commandSuffix = $portVersion compat >= 4
cmd:sed = $portVersion compat >= 4
"
REQUIRES="
haiku$secondaryArchSuffix
"
if [ -n "$secondaryArchSuffix" -a -z "$commandSuffix" ]; then
if [ -n "$secondaryArchSuffix" ]; then
CONFLICTS="
sed
"