From c1060e4b91177545f6ed7d05833a53e17752f4db Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 12 Oct 2017 21:24:09 +0200 Subject: [PATCH] dtc: bump version. disable python bindings. --- .../{dtc-1.4.4.recipe => dtc-1.4.5.recipe} | 12 ++++--- .../{dtc-1.4.4.patch => dtc-1.4.5.patchset} | 33 ++++++++++++------- 2 files changed, 28 insertions(+), 17 deletions(-) rename sys-apps/dtc/{dtc-1.4.4.recipe => dtc-1.4.5.recipe} (83%) rename sys-apps/dtc/patches/{dtc-1.4.4.patch => dtc-1.4.5.patchset} (64%) diff --git a/sys-apps/dtc/dtc-1.4.4.recipe b/sys-apps/dtc/dtc-1.4.5.recipe similarity index 83% rename from sys-apps/dtc/dtc-1.4.4.recipe rename to sys-apps/dtc/dtc-1.4.5.recipe index cb2429942..a558885ef 100644 --- a/sys-apps/dtc/dtc-1.4.4.recipe +++ b/sys-apps/dtc/dtc-1.4.5.recipe @@ -4,10 +4,10 @@ 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="1" SOURCE_URI="https://www.kernel.org/pub/software/utils/dtc/dtc-$portVersion.tar.gz" -CHECKSUM_SHA256="84169ccda61569b2b0f9832b066706e0b58767e0a30fa4194e816aba44e019d9" -PATCHES="dtc-$portVersion.patch" +CHECKSUM_SHA256="a5dee36ac9ddd000e18ffecdbd5e6d83c5d552af21a644fe4e820480daa9f36b" +PATCHES="dtc-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -19,6 +19,7 @@ PROVIDES=" cmd:dtdiff = $portVersion cmd:fdtdump = $portVersion cmd:fdtget = $portVersion + cmd:fdtoverlay = $portVersion cmd:fdtput = $portVersion lib:libfdt$secondaryArchSuffix = $portVersion lib:libfdt_$portVersion$secondaryArchSuffix = $portVersion @@ -41,12 +42,13 @@ BUILD_PREREQUIRES=" BUILD() { - make PREFIX=$prefix $jobArgs + make PREFIX=$prefix $jobArgs NO_PYTHON=TRUE } INSTALL() { - make install PREFIX=$prefix INCLUDEDIR=$includeDir LIBDIR=$libDir + make install PREFIX=$prefix INCLUDEDIR=$includeDir LIBDIR=$libDir \ + NO_PYTHON=TRUE prepareInstalledDevelLibs libfdt } diff --git a/sys-apps/dtc/patches/dtc-1.4.4.patch b/sys-apps/dtc/patches/dtc-1.4.5.patchset similarity index 64% rename from sys-apps/dtc/patches/dtc-1.4.4.patch rename to sys-apps/dtc/patches/dtc-1.4.5.patchset index 64b4229f5..983a6fe2a 100644 --- a/sys-apps/dtc/patches/dtc-1.4.4.patch +++ b/sys-apps/dtc/patches/dtc-1.4.5.patchset @@ -1,9 +1,15 @@ -diff --git a/Makefile dtc-1.3.0-git/Makefile -index 1169e6c..60077a5 100644 +From 655b2c6626425fa89ef0ecf39f9e588f678aca40 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Thu, 12 Oct 2017 21:07:34 +0200 +Subject: Apply patch from 1.3.0. + + +diff --git a/Makefile b/Makefile +index e1e138a..aafda0a 100644 --- a/Makefile -+++ dtc-1.3.0-git/Makefile -@@ -41,6 +41,15 @@ SHAREDLIB_EXT=so - SHAREDLIB_LINK_OPTIONS=-shared -Wl,--version-script=$(LIBFDT_version) -Wl,-soname, ++++ b/Makefile +@@ -49,6 +49,15 @@ SHAREDLIB_CFLAGS = -fPIC + SHAREDLIB_LDFLAGS = -fPIC -shared -Wl,--version-script=$(LIBFDT_version) -Wl,-soname, endif +ifeq ($(HOSTOS),haiku) @@ -18,11 +24,11 @@ index 1169e6c..60077a5 100644 # # Overall rules # -diff --git a/tests/Makefile.tests dtc-1.3.0-git/tests/Makefile.tests -index 1795466..97b6131 100644 +diff --git a/tests/Makefile.tests b/tests/Makefile.tests +index 2258135..b97970f 100644 --- a/tests/Makefile.tests -+++ dtc-1.3.0-git/tests/Makefile.tests -@@ -50,7 +50,7 @@ $(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive) ++++ b/tests/Makefile.tests +@@ -56,7 +56,7 @@ $(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive) $(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive) @$(VECHO) LD [libdl] $@ @@ -31,10 +37,10 @@ index 1795466..97b6131 100644 $(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o \ util.o $(LIBFDT_archive) -diff --git a/tests/testutils.c dtc-1.3.0-git/tests/testutils.c -index f185133..66b34df 100644 +diff --git a/tests/testutils.c b/tests/testutils.c +index 521f4f1..5fa757f 100644 --- a/tests/testutils.c -+++ dtc-1.3.0-git/tests/testutils.c ++++ b/tests/testutils.c @@ -45,16 +45,15 @@ static void sigint_handler(int signum, siginfo_t *si, void *uc) { cleanup(); @@ -64,3 +70,6 @@ index f185133..66b34df 100644 } void check_mem_rsv(void *fdt, int n, uint64_t addr, uint64_t size) +-- +2.14.2 +