On Fri, Oct 14, 2016 at 01:47:10PM +0200, Daniel Melani wrote:
> On Fri, Oct 14, 2016 at 11:51:38AM +0100, Stuart Henderson wrote:
> > On 2016/10/14 12:39, Daniel Melani wrote:
> > > Hi,
> > > 
> > > Here's an update that brings devel/dtc up to the latest version.
> > 
> > Your diff is mangled.
> > 
> 
> Sorry about that. Let me try that again with a sane email client.

It looks like SHARED_LIBS needs to change as well

/usr/src/lib/check_sym /tmp/libfdt.so.1.1 /usr/local/lib/libfdt.so.1.1, gives

/tmp/libfdt.so.1.1 --> /usr/local/lib/libfdt.so.1.1
Dynamic export changes:
added:
        fdt_address_cells@@LIBFDT_1.2
        fdt_first_subnode@@LIBFDT_1.2
        fdt_next_subnode@@LIBFDT_1.2
        fdt_path_offset_namelen@@LIBFDT_1.2
        fdt_resize@@LIBFDT_1.2
        fdt_size_cells@@LIBFDT_1.2
        fdt_stringlist_contains@@LIBFDT_1.2

External reference changes:
added:
        memcmp
        strnlen

removed:
        memcpy
        memset
        strchr
        strlen

PLT added:
        fdt_path_offset_namelen
        fdt_stringlist_contains

> 
> 
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/dtc/Makefile,v
> retrieving revision 1.11
> diff -u -p -r1.11 Makefile
> --- Makefile  19 Nov 2015 20:17:15 -0000      1.11
> +++ Makefile  14 Oct 2016 10:23:18 -0000
> @@ -2,7 +2,7 @@
>  
>  COMMENT=             Device Tree Compiler
>  
> -DISTNAME=            dtc-1.4.1
> +DISTNAME=            dtc-1.4.2
>  CATEGORIES=          sysutils devel
>  MASTER_SITES=                http://www.kernel.org/pub/software/utils/dtc/
>  EXTRACT_SUFX=                .tar.xz
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/dtc/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo  3 Jun 2015 20:17:04 -0000       1.3
> +++ distinfo  14 Oct 2016 10:23:18 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (dtc-1.4.1.tar.xz) = d5kq2OrHto9VPQuljltRYErIA9EmGWyZ4644qq4ou5Q=
> -SIZE (dtc-1.4.1.tar.xz) = 107920
> +SHA256 (dtc-1.4.2.tar.xz) = E0Vu6YQKu7y5VtBxHFgNKFJOLuF4QOVW50QxHy2K+qw=
> +SIZE (dtc-1.4.2.tar.xz) = 112480
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/dtc/patches/patch-Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-Makefile
> --- patches/patch-Makefile    3 Jun 2015 20:17:04 -0000       1.4
> +++ patches/patch-Makefile    14 Oct 2016 10:23:18 -0000
> @@ -1,29 +1,15 @@
> -$OpenBSD: patch-Makefile,v 1.4 2015/06/03 20:17:04 uaa Exp $
> ---- Makefile.orig    Tue Nov 11 22:29:16 2014
> -+++ Makefile Sun May 31 19:50:12 2015
> -@@ -16,9 +16,9 @@ LOCAL_VERSION =
> - CONFIG_LOCALVERSION =
> - 
> +--- Makefile.orig    Sat Sep  3 13:02:30 2016
> ++++ Makefile Fri Oct 14 11:28:16 2016
> +@@ -18,7 +18,7 @@
>   CPPFLAGS = -I libfdt -I .
> --WARNINGS = -Werror -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
> --    -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow
> + WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
> +     -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow
>  -CFLAGS = -g -Os -fPIC -Werror $(WARNINGS)
> -+WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
> -+    -Wstrict-prototypes -Wmissing-prototypes -Wshadow
> -+CFLAGS += -fPIC $(WARNINGS)
> ++CFLAGS = -g -Os -fPIC $(WARNINGS)
>   
>   BISON = bison
>   LEX = flex
> -@@ -38,7 +38,7 @@ SHAREDLIB_EXT=dylib
> - SHAREDLIB_LINK_OPTIONS=-dynamiclib -Wl,-install_name -Wl,
> - else
> - SHAREDLIB_EXT=so
> --SHAREDLIB_LINK_OPTIONS=-shared -Wl,--version-script=$(LIBFDT_version) 
> -Wl,-soname,
> -+SHAREDLIB_LINK_OPTIONS=-shared -Wl,--version-script=$(LIBFDT_version)
> - endif
> - 
> - #
> -@@ -134,7 +134,7 @@ endif
> +@@ -134,7 +134,7 @@
>   LIBFDT_objdir = libfdt
>   LIBFDT_srcdir = libfdt
>   LIBFDT_archive = $(LIBFDT_objdir)/libfdt.a
> @@ -32,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.4 2015/06/0
>   LIBFDT_include = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_INCLUDES))
>   LIBFDT_version = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_VERSION))
>   
> -@@ -169,8 +169,6 @@ install-lib: all
> +@@ -169,8 +169,6 @@
>       @$(VECHO) INSTALL-LIB
>       $(INSTALL) -d $(DESTDIR)$(LIBDIR)
>       $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)
> @@ -41,7 +27,7 @@ $OpenBSD: patch-Makefile,v 1.4 2015/06/0
>       $(INSTALL) -m 644 $(LIBFDT_archive) $(DESTDIR)$(LIBDIR)
>   
>   install-includes:
> -@@ -232,12 +230,12 @@ clean: libfdt_clean tests_clean
> +@@ -248,12 +246,12 @@
>   # Generic compile rules
>   #
>   %: %.o
> @@ -56,7 +42,7 @@ $OpenBSD: patch-Makefile,v 1.4 2015/06/0
>   
>   %.o: %.S
>       @$(VECHO) AS $@
> -@@ -265,7 +263,7 @@ clean: libfdt_clean tests_clean
> +@@ -281,7 +279,7 @@
>   
>   $(LIBFDT_lib):
>       @$(VECHO) LD $@
> Index: patches/patch-tests_Makefile_tests
> ===================================================================
> RCS file: /cvs/ports/devel/dtc/patches/patch-tests_Makefile_tests,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-tests_Makefile_tests
> --- patches/patch-tests_Makefile_tests        3 Jun 2015 20:17:04 -0000       
> 1.3
> +++ patches/patch-tests_Makefile_tests        14 Oct 2016 10:23:18 -0000
> @@ -1,7 +1,6 @@
> -$OpenBSD: patch-tests_Makefile_tests,v 1.3 2015/06/03 20:17:04 uaa Exp $
> ---- tests/Makefile.tests.orig        Wed Nov 12 12:29:16 2014
> -+++ tests/Makefile.tests     Sun May 31 04:25:17 2015
> -@@ -52,7 +52,7 @@ $(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(L
> +--- tests/Makefile.tests.orig        Sat Sep  3 13:02:30 2016
> ++++ tests/Makefile.tests     Fri Oct 14 11:42:41 2016
> +@@ -54,7 +54,7 @@
>   
>   $(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive)
>       @$(VECHO) LD [libdl] $@
> 

Reply via email to