Date: Tue, 23 Jan 2018 18:18:12 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459790 - in head/sysutils/dtc: . files Message-ID: <201801231818.w0NIICqY089147@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans (src committer) Date: Tue Jan 23 18:18:12 2018 New Revision: 459790 URL: https://svnweb.freebsd.org/changeset/ports/459790 Log: sysutils/dtc: Update to 1.4.6 and add test support dtc 1.4.6 was released 2018/01/03 with various additional checks and bugfixes, as well as support for some syntactic sugar for overlays that allows the following: == /dts-v1/; /plugin/; &foo { status = "okay"; }; == Issues addressed by the previous patches have been fixed upstream, and the two patches included here have been accepted upstream following the release of 1.4.6. The patches, along with the TEST_ENV, will be able to go away when 1.4.7 is released. While here, hook up the test suite and flip maintainer over to uboot@. Reviewed by: imp, manu Approved by: imp (maintainer, ports committer) Differential Revision: https://reviews.freebsd.org/D13761 Added: head/sysutils/dtc/files/patch-Makefile (contents, props changed) head/sysutils/dtc/files/patch-tests_Makefile.tests (contents, props changed) Deleted: head/sysutils/dtc/files/patch-checks.c head/sysutils/dtc/files/patch-fdtoverlay.c Modified: head/sysutils/dtc/Makefile head/sysutils/dtc/distinfo head/sysutils/dtc/pkg-plist Modified: head/sysutils/dtc/Makefile ============================================================================== --- head/sysutils/dtc/Makefile Tue Jan 23 17:30:49 2018 (r459789) +++ head/sysutils/dtc/Makefile Tue Jan 23 18:18:12 2018 (r459790) @@ -1,12 +1,11 @@ # $FreeBSD$ PORTNAME= dtc -PORTVERSION= 1.4.5 -PORTREVISION= 1 +PORTVERSION= 1.4.6 DISTVERSIONPREFIX= v CATEGORIES= sysutils -MAINTAINER= imp@FreeBSD.org +MAINTAINER= uboot@FreeBSD.org COMMENT= Device Tree Compiler LICENSE= GPLv2 @@ -15,10 +14,15 @@ USES= bison gmake shebangfix USE_LDCONFIG= yes SHEBANG_FILES= dtdiff +TEST_TARGET= check +TEST_ENV= STATSZ="stat -f %Uz" + USE_GITHUB= yes GH_ACCOUNT= dgibson GH_PROJECT= dtc -MAKE_ARGS+= PREFIX=${PREFIX} NO_PYTHON=yes +MAKE_ARGS+= PREFIX=${PREFIX} NO_PYTHON=yes \ + INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ + INSTALL_LIB="${INSTALL_LIB}" .include <bsd.port.mk> Modified: head/sysutils/dtc/distinfo ============================================================================== --- head/sysutils/dtc/distinfo Tue Jan 23 17:30:49 2018 (r459789) +++ head/sysutils/dtc/distinfo Tue Jan 23 18:18:12 2018 (r459790) @@ -1,3 +1,3 @@ -TIMESTAMP = 1511715245 -SHA256 (dgibson-dtc-v1.4.5_GH0.tar.gz) = d13df67f5402c1905d2c24603471fe783965112ab5004025a50f7f852cd89bc8 -SIZE (dgibson-dtc-v1.4.5_GH0.tar.gz) = 174933 +TIMESTAMP = 1515034018 +SHA256 (dgibson-dtc-v1.4.6_GH0.tar.gz) = 394d2fb852c326b070e9d7732b396f5d57da86cac728fe58a519a505cfb01837 +SIZE (dgibson-dtc-v1.4.6_GH0.tar.gz) = 176882 Added: head/sysutils/dtc/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/dtc/files/patch-Makefile Tue Jan 23 18:18:12 2018 (r459790) @@ -0,0 +1,78 @@ +--- Makefile.orig 2018-01-04 03:37:52 UTC ++++ Makefile +@@ -26,6 +26,10 @@ SWIG = swig + PKG_CONFIG ?= pkg-config + + INSTALL = /usr/bin/install ++INSTALL_PROGRAM = $(INSTALL) ++INSTALL_LIB = $(INSTALL) ++INSTALL_DATA = $(INSTALL) -m 644 ++INSTALL_SCRIPT = $(INSTALL) + DESTDIR = + PREFIX = $(HOME) + BINDIR = $(PREFIX)/bin +@@ -191,20 +195,21 @@ endif + install-bin: all $(SCRIPTS) + @$(VECHO) INSTALL-BIN + $(INSTALL) -d $(DESTDIR)$(BINDIR) +- $(INSTALL) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR) ++ $(INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(BINDIR) ++ $(INSTALL_SCRIPT) $(SCRIPTS) $(DESTDIR)$(BINDIR) + + install-lib: all + @$(VECHO) INSTALL-LIB + $(INSTALL) -d $(DESTDIR)$(LIBDIR) +- $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR) ++ $(INSTALL_LIB) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR) + ln -sf $(notdir $(LIBFDT_lib)) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname) + ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/libfdt.$(SHAREDLIB_EXT) +- $(INSTALL) -m 644 $(LIBFDT_archive) $(DESTDIR)$(LIBDIR) ++ $(INSTALL_DATA) $(LIBFDT_archive) $(DESTDIR)$(LIBDIR) + + install-includes: + @$(VECHO) INSTALL-INC + $(INSTALL) -d $(DESTDIR)$(INCLUDEDIR) +- $(INSTALL) -m 644 $(LIBFDT_include) $(DESTDIR)$(INCLUDEDIR) ++ $(INSTALL_DATA) $(LIBFDT_include) $(DESTDIR)$(INCLUDEDIR) + + install: install-bin install-lib install-includes + +--- Makefile.orig 2018-01-04 03:37:52 UTC ++++ Makefile +@@ -26,6 +26,10 @@ SWIG = swig + PKG_CONFIG ?= pkg-config + + INSTALL = /usr/bin/install ++INSTALL_PROGRAM = $(INSTALL) ++INSTALL_LIB = $(INSTALL) ++INSTALL_DATA = $(INSTALL) -m 644 ++INSTALL_SCRIPT = $(INSTALL) + DESTDIR = + PREFIX = $(HOME) + BINDIR = $(PREFIX)/bin +@@ -191,20 +195,21 @@ endif + install-bin: all $(SCRIPTS) + @$(VECHO) INSTALL-BIN + $(INSTALL) -d $(DESTDIR)$(BINDIR) +- $(INSTALL) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR) ++ $(INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(BINDIR) ++ $(INSTALL_SCRIPT) $(SCRIPTS) $(DESTDIR)$(BINDIR) + + install-lib: all + @$(VECHO) INSTALL-LIB + $(INSTALL) -d $(DESTDIR)$(LIBDIR) +- $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR) ++ $(INSTALL_LIB) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR) + ln -sf $(notdir $(LIBFDT_lib)) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname) + ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/libfdt.$(SHAREDLIB_EXT) +- $(INSTALL) -m 644 $(LIBFDT_archive) $(DESTDIR)$(LIBDIR) ++ $(INSTALL_DATA) $(LIBFDT_archive) $(DESTDIR)$(LIBDIR) + + install-includes: + @$(VECHO) INSTALL-INC + $(INSTALL) -d $(DESTDIR)$(INCLUDEDIR) +- $(INSTALL) -m 644 $(LIBFDT_include) $(DESTDIR)$(INCLUDEDIR) ++ $(INSTALL_DATA) $(LIBFDT_include) $(DESTDIR)$(INCLUDEDIR) + + install: install-bin install-lib install-includes + Added: head/sysutils/dtc/files/patch-tests_Makefile.tests ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/dtc/files/patch-tests_Makefile.tests Tue Jan 23 18:18:12 2018 (r459790) @@ -0,0 +1,22 @@ +--- tests/Makefile.tests.orig 2018-01-03 06:04:32 UTC ++++ tests/Makefile.tests +@@ -56,7 +56,7 @@ $(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(L + + $(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive) + @$(VECHO) LD [libdl] $@ +- $(LINK.c) -o $@ $^ -ldl ++ $(LINK.c) -o $@ $^ + + $(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o \ + util.o $(LIBFDT_archive) +--- tests/Makefile.tests.orig 2018-01-03 06:04:32 UTC ++++ tests/Makefile.tests +@@ -56,7 +56,7 @@ $(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(L + + $(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive) + @$(VECHO) LD [libdl] $@ +- $(LINK.c) -o $@ $^ -ldl ++ $(LINK.c) -o $@ $^ + + $(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o \ + util.o $(LIBFDT_archive) Modified: head/sysutils/dtc/pkg-plist ============================================================================== --- head/sysutils/dtc/pkg-plist Tue Jan 23 17:30:49 2018 (r459789) +++ head/sysutils/dtc/pkg-plist Tue Jan 23 18:18:12 2018 (r459790) @@ -3,8 +3,9 @@ bin/dtc bin/dtdiff bin/fdtdump bin/fdtget +bin/fdtoverlay bin/fdtput -lib/libfdt-1.4.5.so +lib/libfdt-1.4.6.so lib/libfdt.a lib/libfdt.so lib/libfdt.so.1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801231818.w0NIICqY089147>