mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
dtc, remove static library, cleanup (#8491)
This commit is contained in:
@@ -1,95 +0,0 @@
|
||||
SUMMARY="The Device Tree Compiler"
|
||||
DESCRIPTION="The Device Tree Compiler (DTC) is the toolchain for building \
|
||||
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="2"
|
||||
SOURCE_URI="https://www.kernel.org/pub/software/utils/dtc/dtc-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="6643e8f00ff86350f465bb54b2185058b5b1b7bac01a0842c81a52b86589cde7"
|
||||
PATCHES="dtc-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
commandSuffix=$secondaryArchSuffix
|
||||
commandBinDir=$binDir
|
||||
if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
commandSuffix=
|
||||
commandBinDir=$prefix/bin
|
||||
fi
|
||||
|
||||
libVersion=$portVersion
|
||||
libVersionCompat=${libVersion%%.*}
|
||||
|
||||
PROVIDES="
|
||||
dtc$secondaryArchSuffix = $portVersion
|
||||
cmd:convert_dtsv0$commandSuffix = $portVersion
|
||||
cmd:dtc$commandSuffix = $portVersion
|
||||
cmd:dtdiff$commandSuffix = $portVersion
|
||||
cmd:fdtdump$commandSuffix = $portVersion
|
||||
cmd:fdtget$commandSuffix = $portVersion
|
||||
cmd:fdtoverlay$commandSuffix = $portVersion
|
||||
cmd:fdtput$commandSuffix = $portVersion
|
||||
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
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:bison >= 2.5
|
||||
cmd:cmp
|
||||
cmd:flex
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:make
|
||||
"
|
||||
|
||||
defineDebugInfoPackage dtc$secondaryArchSuffix \
|
||||
$commandBinDir/convert-dtsv0 \
|
||||
$commandBinDir/dtc \
|
||||
$commandBinDir/fdtdump \
|
||||
$commandBinDir/fdtget \
|
||||
$commandBinDir/fdtoverlay \
|
||||
$commandBinDir/fdtput \
|
||||
$libDir/libfdt-$portVersion.so
|
||||
|
||||
BUILD()
|
||||
{
|
||||
make PREFIX=$prefix $jobArgs NO_PYTHON=TRUE
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install \
|
||||
PREFIX=$prefix \
|
||||
BINDIR=$commandBinDir \
|
||||
INCLUDEDIR=$includeDir \
|
||||
LIBDIR=$libDir \
|
||||
NO_PYTHON=1
|
||||
|
||||
prepareInstalledDevelLibs libfdt
|
||||
|
||||
packageEntries devel $developDir
|
||||
|
||||
ln -r -s $libDir/libfdt-$portVersion.so \
|
||||
$libDir/libfdt.so.$libVersionCompat
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
}
|
||||
@@ -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="2"
|
||||
REVISION="3"
|
||||
SOURCE_URI="https://www.kernel.org/pub/software/utils/dtc/dtc-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="65cec529893659a49a89740bb362f507a3b94fc8cd791e76a8d6a2b6f3203473"
|
||||
PATCHES="dtc-$portVersion.patchset"
|
||||
@@ -93,6 +93,9 @@ INSTALL()
|
||||
LIBDIR=$libDir \
|
||||
NO_PYTHON=1
|
||||
|
||||
# remove static library
|
||||
rm -f $libDir/libfdt.a
|
||||
|
||||
prepareInstalledDevelLibs libfdt libfdt-$portVersion
|
||||
|
||||
packageEntries devel $developDir
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
From b7dcc2d3e058c0aa9e84ce94177c2e86a69d5ce6 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Thu, 12 Oct 2017 21:07:34 +0200
|
||||
Subject: Apply patch from 1.3.0.
|
||||
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index d8ebc4f..4333411 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -53,6 +53,15 @@ SHAREDLIB_CFLAGS = -fPIC
|
||||
SHAREDLIB_LDFLAGS = -fPIC -shared -Wl,--version-script=$(LIBFDT_version) -Wl,-soname,
|
||||
endif
|
||||
|
||||
+ifeq ($(HOSTOS),haiku)
|
||||
+INSTALL = /bin/install
|
||||
+endif
|
||||
+
|
||||
+ifneq ($(HOSTOS),haiku)
|
||||
+LIBDL = -ldl
|
||||
+endif
|
||||
+
|
||||
+
|
||||
#
|
||||
# Overall rules
|
||||
#
|
||||
diff --git a/tests/testutils.c b/tests/testutils.c
|
||||
index 75e3e20..bc2b539 100644
|
||||
--- a/tests/testutils.c
|
||||
+++ b/tests/testutils.c
|
||||
@@ -50,16 +50,15 @@ static void sigint_handler(int signum, siginfo_t *si, void *uc)
|
||||
{
|
||||
cleanup();
|
||||
fprintf(stderr, "%s: %s (pid=%d)\n", test_name,
|
||||
- strsignal(signum), getpid());
|
||||
+ strsignal(signum), (int)getpid());
|
||||
exit(RC_BUG);
|
||||
}
|
||||
|
||||
void test_init(int argc, char *argv[])
|
||||
{
|
||||
int err;
|
||||
- struct sigaction sa_int = {
|
||||
- .sa_sigaction = sigint_handler,
|
||||
- };
|
||||
+ struct sigaction sa_int = { };
|
||||
+ sa_int.sa_sigaction = sigint_handler;
|
||||
|
||||
test_name = argv[0];
|
||||
|
||||
@@ -71,7 +70,7 @@ void test_init(int argc, char *argv[])
|
||||
verbose_test = 0;
|
||||
|
||||
verbose_printf("Starting testcase \"%s\", pid %d\n",
|
||||
- test_name, getpid());
|
||||
+ test_name, (int)getpid());
|
||||
}
|
||||
|
||||
void check_mem_rsv(void *fdt, int n, uint64_t addr, uint64_t size)
|
||||
--
|
||||
2.19.0
|
||||
|
||||
Reference in New Issue
Block a user