dtc: Update to 1.4.6 (#1360)

msys2 · Jul 26, 2018 · 78db2f6 · 78db2f6
1 parent 3776089
commit 78db2f6
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 68 deletions.
diff --git a/dtc/01-correct-shared-library-extension.patch b/dtc/01-correct-shared-library-extension.patch
@@ -0,0 +1,65 @@
+--- dtc/akefile.orig	2018-01-03 07:04:32.000000000 +0100
++++ dtc/Makefile	2018-07-26 17:52:18.156225100 +0200
+@@ -18,7 +18,7 @@
+ CPPFLAGS = -I libfdt -I .
+ WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
+ 	-Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow
+-CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS)
++CFLAGS = -g -Os $(SHAREDLIB_CFLAGS)  $(WARNINGS)
+
+ BISON = bison
+ LEX = flex
+@@ -40,9 +40,9 @@
+ SHAREDLIB_CFLAGS  = -fPIC
+ SHAREDLIB_LDFLAGS = -fPIC -dynamiclib -Wl,-install_name -Wl,
+ else ifeq ($(HOSTOS),$(filter $(HOSTOS),msys cygwin))
+-SHAREDLIB_EXT     = so
++SHAREDLIB_EXT     = dll
+ SHAREDLIB_CFLAGS  =
+ SHAREDLIB_LDFLAGS = -shared -Wl,--version-script=$(LIBFDT_version) -Wl,-soname,
+ else
+ SHAREDLIB_EXT     = so
+ SHAREDLIB_CFLAGS  = -fPIC
+@@ -177,7 +179,7 @@
+ libfdt_clean:
+ 	@$(VECHO) CLEAN "(libfdt)"
+ 	rm -f $(addprefix $(LIBFDT_objdir)/,$(STD_CLEANFILES))
+-	rm -f $(LIBFDT_objdir)/*.so
++	rm -f $(LIBFDT_objdir)/*.$(SHAREDLIB_EXT)
+
+ ifneq ($(DEPTARGETS),)
+ -include $(LIBFDT_OBJS:%.o=$(LIBFDT_objdir)/%.d)
+@@ -246,7 +248,7 @@
+ include $(PYLIBFDT_srcdir)/Makefile.pylibfdt
+
+ .PHONY: pylibfdt
+-pylibfdt: $(PYLIBFDT_objdir)/_libfdt.so
++pylibfdt: $(PYLIBFDT_objdir)/_libfdt.$(SHAREDLIB_EXT)
+
+ pylibfdt_clean:
+ 	@$(VECHO) CLEAN "(pylibfdt)"
+--- dtc/pylibfdt/Makefile.pylibfdt.orig	2018-01-03 07:04:32.000000000 +0100
++++ dtc/pylibfdt/Makefile.pylibfdt	2018-07-26 17:52:36.463209700 +0200
+@@ -3,7 +3,7 @@
+
+ PYLIBFDT_srcs = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_SRCS)) \
+ 		$(PYLIBFDT_srcdir)/libfdt.i
+-PYMODULE = $(PYLIBFDT_objdir)/_libfdt.so
++PYMODULE = $(PYLIBFDT_objdir)/_libfdt.$(SHAREDLIB_EXT)
+
+ define run_setup
+ 	SOURCES="$(1)" CPPFLAGS="$(CPPFLAGS)" OBJDIR="$(PYLIBFDT_objdir)"
+@@ -14,11 +14,11 @@
+ $(PYMODULE): $(PYLIBFDT_srcs)
+ 	@$(VECHO) PYMOD $@
+ 	$(call run_setup, $^, build_ext --inplace)
+-	mv _libfdt.so $@
++	mv _libfdt.$(SHAREDLIB_EXT) $@
+
+ install_pylibfdt: $(PYMODULE)
+ 	$(VECHO) INSTALL-PYLIB; \
+ 	$(call run_setup, $(PYLIBFDT_srcs), \
+ 		install $(if $(SETUP_PREFIX),--prefix=$(SETUP_PREFIX)))
+
+-PYLIBFDT_cleanfiles = libfdt_wrap.c libfdt.py libfdt.pyc _libfdt.so
++PYLIBFDT_cleanfiles = libfdt_wrap.c libfdt.py libfdt.pyc _libfdt.$(SHAREDLIB_EXT)
diff --git a/dtc/PKGBUILD b/dtc/PKGBUILD
@@ -1,29 +1,38 @@
 # Maintainer: Andy Gross <andy.gross@linaro.org>
 
 pkgname=dtc
-pkgver=1.4.4
+pkgver=1.4.6
 pkgrel=1
 pkgdesc="Device Tree Compiler"
 arch=('i686' 'x86_64')
 url="https://git.kernel.org/pub/scm/utils/dtc/dtc/git"
 license=('GPL2')
 groups=('base')
-
+makedepends=('python2' 'swig' 'libcrypt-devel')
 source=("https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/${pkgname}-${pkgver}.tar.gz"
-        fpic.patch)
-sha256sums=('2f2c0bf4d84763595953885bdcd2159b0b85410018c8ba48cc31b3d6e443e4d8'
-            '72c5f92003c3120ee2400939aaf2c0ebc372fc9c922c6ae07b6be8b0c2470a74')
+        01-correct-shared-library-extension.patch)
+sha256sums=('394d2fb852c326b070e9d7732b396f5d57da86cac728fe58a519a505cfb01837'
+            '1ed428b3e1f140132522f54984e9b8cc2c20365517569bbd8784852af8dfa503')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/fpic.patch"
+  sed -i 's/python\b/python2/' tests/run_tests.sh
+
+  # to make check work
+  sed -i 's/__attribute__((weak))//' tests/testutils.c
+  patch -p1 -i "${srcdir}/01-correct-shared-library-extension.patch"
 }
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make
 }
 
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make PREFIX= DESTDIR="${pkgdir}/usr" install

diff --git a/dtc/fpic.patch b/dtc/fpic.patch