diff --git a/sys-apps/dtc/dtc-1.4.7.recipe b/sys-apps/dtc/dtc-1.4.7.recipe index 30b0bddb2..962087962 100644 --- a/sys-apps/dtc/dtc-1.4.7.recipe +++ b/sys-apps/dtc/dtc-1.4.7.recipe @@ -4,7 +4,7 @@ device tree source files (*.dts) into the binary format (*.dtb)." HOMEPAGE="https://git.kernel.org/cgit/utils/dtc/dtc.git" COPYRIGHT="2005 David Gibson, IBM Corporation" LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://www.kernel.org/pub/software/utils/dtc/dtc-$portVersion.tar.xz" CHECKSUM_SHA256="6643e8f00ff86350f465bb54b2185058b5b1b7bac01a0842c81a52b86589cde7" PATCHES="dtc-$portVersion.patchset" @@ -20,7 +20,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then fi libVersion=$portVersion -libVersionCompat="$libVersion compat >= ${libVersion%%.*}" +libVersionCompat=${libVersion%%.*} PROVIDES=" dtc$secondaryArchSuffix = $portVersion @@ -31,15 +31,22 @@ PROVIDES=" cmd:fdtget$commandSuffix = $portVersion cmd:fdtoverlay$commandSuffix = $portVersion cmd:fdtput$commandSuffix = $portVersion - lib:libfdt$secondaryArchSuffix = $libVersionCompat - lib:libfdt_$portVersion$secondaryArchSuffix - devel:libfdt$secondaryArchSuffix = $libVersionCompat - devel:libfdt_$portVersion$secondaryArchSuffix + lib:libfdt$secondaryArchSuffix = $libVersion compat >= $libVersionCompat + lib:libfdt_$portVersion$secondaryArchSuffix = $libVersion compat >= $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix " +PROVIDES_devel=" + dtc${secondaryArchSuffix}_devel = $portVersion + devel:libfdt$secondaryArchSuffix + devel:libfdt_$portVersion$secondaryArchSuffix + " +REQUIRES_devel=" + dtc$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " @@ -52,13 +59,13 @@ BUILD_PREREQUIRES=" " defineDebugInfoPackage dtc$secondaryArchSuffix \ - "$commandBinDir"/convert-dtsv0 \ - "$commandBinDir"/dtc \ - "$commandBinDir"/fdtdump \ - "$commandBinDir"/fdtget \ - "$commandBinDir"/fdtoverlay \ - "$commandBinDir"/fdtput \ - "$libDir"/libfdt-$portVersion.so + $commandBinDir/convert-dtsv0 \ + $commandBinDir/dtc \ + $commandBinDir/fdtdump \ + $commandBinDir/fdtget \ + $commandBinDir/fdtoverlay \ + $commandBinDir/fdtput \ + $libDir/libfdt-$portVersion.so BUILD() { @@ -67,13 +74,19 @@ BUILD() INSTALL() { - make install PREFIX="$prefix" BINDIR="$commandBinDir" \ - INCLUDEDIR="$includeDir" LIBDIR="$libDir" NO_PYTHON=1 + make install \ + PREFIX=$prefix \ + BINDIR=$commandBinDir \ + INCLUDEDIR=$includeDir \ + LIBDIR=$libDir \ + NO_PYTHON=1 prepareInstalledDevelLibs libfdt - ln -r -s "$libDir"/libfdt-$portVersion.so "$developLibDir" + packageEntries devel $developDir + ln -r -s $libDir/libfdt-$portVersion.so \ + $libDir/libfdt.so.$libVersionCompat } TEST()