>From b6ac0c3cc24bcda262936d5c2b97ebbb9efb8951 Mon Sep 17 00:00:00 2001
From: Karel Gardas <karel@functional.vision>
Date: Thu, 11 Nov 2021 13:39:35 +0100
Subject: [PATCH 2/3] fix compilation of dtc-1.6.0 on FreeBSD

---
 source-builder/config/dtc-1-1.cfg                    |  5 ++++-
 source-builder/patches/dtc-1.6.0-freebsd13-fix.patch | 10 ++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 source-builder/patches/dtc-1.6.0-freebsd13-fix.patch

diff --git a/source-builder/config/dtc-1-1.cfg
b/source-builder/config/dtc-1-1.cfg
index 686a1e0..3c9084a 100644
--- a/source-builder/config/dtc-1-1.cfg
+++ b/source-builder/config/dtc-1-1.cfg
@@ -18,6 +18,9 @@ URL:     https://www.devicetree.org/
 # Source
 #
 %source set dtc
https://www.kernel.org/pub/software/utils/dtc/dtc-%{dtc_version}.tar.gz
+%patch add dtc file://dtc-1.6.0-freebsd13-fix.patch
+%hash sha512 dtc-1.6.0-freebsd13-fix.patch
78c2d5336399bf735f16cab6349e54503f90aea0b2b8c40727769b209c6c48fa18e2bad9b6e497cab940f53585140c5ebfa413a52077fcd40db9acef0a39946c

+

 #
 # Prepare the source code.
@@ -26,7 +29,7 @@ URL:     https://www.devicetree.org/
   build_top=$(pwd)

   %source setup dtc -q -n dtc-%{dtc_version}
-  %patch setup dtc -p1
+  %patch setup dtc -p0

   cd ${build_top}

diff --git a/source-builder/patches/dtc-1.6.0-freebsd13-fix.patch
b/source-builder/patches/dtc-1.6.0-freebsd13-fix.patch
new file mode 100644
index 0000000..13ee731
--- /dev/null
+++ b/source-builder/patches/dtc-1.6.0-freebsd13-fix.patch
@@ -0,0 +1,10 @@
+--- Makefile.orig      2021-11-11 10:04:51.462057000 +0100
++++ Makefile   2021-11-11 10:04:57.933978000 +0100
+@@ -58,6 +58,7 @@
+ ifeq ($(NO_YAML),1)
+       CFLAGS += -DNO_YAML
+ else
++      CFLAGS += $(shell $(PKG_CONFIG) --cflags yaml-0.1)
+       LDLIBS_dtc += $(shell $(PKG_CONFIG) --libs yaml-0.1)
+ endif
+
-- 
2.25.1
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel

Reply via email to