On Sat, Jan 30, 2021 at 04:59:33PM +1100, Jonathan Gray wrote: > On Fri, Jan 29, 2021 at 10:15:21PM +0100, Klemens Nanni wrote: > > The new version from 04.04.2020 fixes `-fno-common' builds. > > I sysutils/dtb already built on amd64 with this diff, the following > > consumers have yet to build-tested: > > > > $ show-reverse-deps devel/dtc > > emulators/qemu > > emulators/spike > > sysutils/u-boot > > sysutils/u-boot,aarch64 > > sysutils/u-boot,arm > > > > Feedback? OK? > > looks like at least a minor crank is needed > > Dynamic export changes: > added: > fdt_header_size@@LIBFDT_1.2 Thanks, I simply forgot checking that.
Here's with a minor crank. Index: Makefile =================================================================== RCS file: /cvs/ports/devel/dtc/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- Makefile 8 Dec 2019 09:55:37 -0000 1.17 +++ Makefile 30 Jan 2021 11:23:22 -0000 @@ -2,12 +2,12 @@ COMMENT= Device Tree Compiler -DISTNAME= dtc-1.5.1 +DISTNAME= dtc-1.6.0 CATEGORIES= sysutils devel MASTER_SITES= https://www.kernel.org/pub/software/utils/dtc/ EXTRACT_SUFX= .tar.xz -SHARED_LIBS= fdt 5.0 +SHARED_LIBS= fdt 5.1 # GPLv2 PERMIT_PACKAGE= Yes Index: distinfo =================================================================== RCS file: /cvs/ports/devel/dtc/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo 8 Dec 2019 09:55:37 -0000 1.7 +++ distinfo 29 Jan 2021 21:06:45 -0000 @@ -1,2 +1,2 @@ -SHA256 (dtc-1.5.1.tar.xz) = Zgt0A5aQ/DcBNmBUTQkZGDTvtYUDxzxVXFUTunWrAx8= -SIZE (dtc-1.5.1.tar.xz) = 155780 +SHA256 (dtc-1.6.0.tar.xz) = EFA7AhfhsHkz4p6NNHoAAVskMb6l9Zr+C+068wNAyC0= +SIZE (dtc-1.6.0.tar.xz) = 158584 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/devel/dtc/patches/patch-Makefile,v retrieving revision 1.8 diff -u -p -r1.8 patch-Makefile --- patches/patch-Makefile 8 Dec 2019 09:55:37 -0000 1.8 +++ patches/patch-Makefile 29 Jan 2021 21:07:59 -0000 @@ -1,11 +1,13 @@ $OpenBSD: patch-Makefile,v 1.8 2019/12/08 09:55:37 ajacoutot Exp $ +Fix shared library versions. + Index: Makefile --- Makefile.orig +++ Makefile -@@ -18,8 +18,8 @@ CONFIG_LOCALVERSION = +@@ -22,8 +22,8 @@ ASSUME_MASK ?= 0 - CPPFLAGS = -I libfdt -I . + CPPFLAGS = -I libfdt -I . -DFDT_ASSUME_MASK=$(ASSUME_MASK) WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \ - -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow -CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS) $(EXTRA_CFLAGS) @@ -14,7 +16,7 @@ Index: Makefile BISON = bison LEX = flex -@@ -66,7 +66,7 @@ SHAREDLIB_LDFLAGS = -shared -Wl,--version-script=$(LIB +@@ -72,7 +72,7 @@ SHAREDLIB_LDFLAGS = -shared -Wl,--version-script=$(LIB else SHAREDLIB_EXT = so SHAREDLIB_CFLAGS = -fPIC @@ -23,7 +25,7 @@ Index: Makefile endif # -@@ -151,7 +151,7 @@ all: $(BIN) libfdt +@@ -157,7 +157,7 @@ all: $(BIN) libfdt check_python_deps = \ if $(PKG_CONFIG) --cflags $(PYTHON) >/dev/null 2>&1; then \ if which swig >/dev/null 2>&1; then \ @@ -32,7 +34,7 @@ Index: Makefile fi; \ fi; \ if [ "$${can_build}" = "yes" ]; then \ -@@ -198,9 +198,8 @@ $(LIBFDT_archive): $(addprefix $(LIBFDT_dir)/,$(LIBFDT +@@ -204,9 +204,8 @@ $(LIBFDT_archive): $(addprefix $(LIBFDT_dir)/,$(LIBFDT $(LIBFDT_lib): $(addprefix $(LIBFDT_dir)/,$(LIBFDT_OBJS)) $(LIBFDT_version) @$(VECHO) LD $@ @@ -43,7 +45,7 @@ Index: Makefile ifneq ($(DEPTARGETS),) -include $(LIBFDT_OBJS:%.o=$(LIBFDT_dir)/%.d) -@@ -221,8 +220,6 @@ install-lib: all +@@ -227,8 +226,6 @@ install-lib: all @$(VECHO) INSTALL-LIB $(INSTALL) -d $(DESTDIR)$(LIBDIR) $(INSTALL_LIB) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR) Index: patches/patch-libfdt_Makefile_libfdt =================================================================== RCS file: /cvs/ports/devel/dtc/patches/patch-libfdt_Makefile_libfdt,v retrieving revision 1.3 diff -u -p -r1.3 patch-libfdt_Makefile_libfdt --- patches/patch-libfdt_Makefile_libfdt 8 Dec 2019 09:55:37 -0000 1.3 +++ patches/patch-libfdt_Makefile_libfdt 29 Jan 2021 21:08:06 -0000 @@ -1,11 +1,13 @@ $OpenBSD: patch-libfdt_Makefile_libfdt,v 1.3 2019/12/08 09:55:37 ajacoutot Exp $ +Fix shared library versions. + Index: libfdt/Makefile.libfdt --- libfdt/Makefile.libfdt.orig +++ libfdt/Makefile.libfdt @@ -10,7 +10,7 @@ LIBFDT_VERSION = version.lds LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c fdt_empty_tree.c \ - fdt_addresses.c fdt_overlay.c + fdt_addresses.c fdt_overlay.c fdt_check.c LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o) -LIBFDT_LIB = libfdt-$(DTC_VERSION).$(SHAREDLIB_EXT) +LIBFDT_LIB = libfdt.$(SHAREDLIB_EXT).${libfdt_ltversion}
