mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
gptfdisk: Fix recipe, drop util_linux hacks
This commit is contained in:
@@ -9,7 +9,7 @@ and enables changing partition types from primary to logical and vice-versa."
|
||||
HOMEPAGE="http://www.rodsbooks.com/gdisk/"
|
||||
COPYRIGHT="2013-2018 Rod Smith"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="2"
|
||||
REVISION="3"
|
||||
SOURCE_URI="https://downloads.sf.net/gptfdisk/gptfdisk-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="b663391a6876f19a3cd901d862423a16e2b5ceaa2f4a3b9bb681e64b9c7ba78d"
|
||||
PATCHES="gptfdisk-$portVersion.patchset"
|
||||
@@ -25,13 +25,8 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
commandBinDir=$prefix/bin
|
||||
fi
|
||||
|
||||
if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
|
||||
libuuidMinimumVersion=1.0.0
|
||||
else
|
||||
libuuidMinimumVersion=1.3.0
|
||||
# The libuuid from util_linux needs libintl.
|
||||
export LDFLAGS=-lintl
|
||||
fi
|
||||
# 1.3.1 is the "fixed" non util_linux version of libuuid
|
||||
libuuidMinimumVersion=1.3.1
|
||||
|
||||
PROVIDES="
|
||||
gptfdisk$secondaryArchSuffix = $portVersion
|
||||
@@ -46,11 +41,7 @@ REQUIRES="
|
||||
lib:libncursesw$secondaryArchSuffix
|
||||
lib:libpopt$secondaryArchSuffix
|
||||
"
|
||||
if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
|
||||
REQUIRES+="
|
||||
lib:libintl$secondaryArchSuffix
|
||||
"
|
||||
fi
|
||||
|
||||
if [ -n "$secondaryArchSuffix" -a "$commandBinDir" != "$binDir" ]; then
|
||||
CONFLICTS="
|
||||
gptfdisk
|
||||
@@ -63,11 +54,6 @@ BUILD_REQUIRES="
|
||||
devel:libncursesw$secondaryArchSuffix
|
||||
devel:libpopt$secondaryArchSuffix
|
||||
"
|
||||
if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
|
||||
BUILD_REQUIRES+="
|
||||
devel:libintl$secondaryArchSuffix
|
||||
"
|
||||
fi
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:g++$secondaryArchSuffix
|
||||
cmd:install
|
||||
|
||||
Reference in New Issue
Block a user