Skip to content

Commit

Permalink
dtc: Update to 1.7.2
Browse files Browse the repository at this point in the history
patch refresh
  • Loading branch information
lazka committed Dec 17, 2024
1 parent 67906da commit 6f0e101
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
34 changes: 17 additions & 17 deletions dtc/01-correct-shared-library-extension.patch
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
--- dtc-1.5.0/Makefile.orig 2019-03-06 07:51:37.000000000 +0300
+++ dtc-1.5.0/Makefile 2019-04-25 08:41:36.269390800 +0300
@@ -18,7 +18,7 @@
CPPFLAGS = -I libfdt -I .
WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
-Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow
--- dtc-1.7.2/Makefile.orig 2024-11-06 04:01:37.000000000 +0100
+++ dtc-1.7.2/Makefile 2024-12-17 08:16:32.746503200 +0100
@@ -21,7 +21,7 @@
WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs -Wsign-compare \
-Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow \
-Wsuggest-attribute=format -Wwrite-strings
-CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS) $(EXTRA_CFLAGS)
+CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) $(WARNINGS) $(EXTRA_CFLAGS)
+CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) $(WARNINGS) $(EXTRA_CFLAGS)

BISON = bison
LEX = flex
@@ -59,9 +59,9 @@
@@ -69,9 +69,9 @@
SHAREDLIB_CFLAGS = -fPIC
SHAREDLIB_LDFLAGS = -fPIC -dynamiclib -Wl,-install_name -Wl,
else ifeq ($(HOSTOS),$(filter $(HOSTOS),msys cygwin))
Expand All @@ -21,8 +21,8 @@
else
SHAREDLIB_EXT = so
SHAREDLIB_CFLAGS = -fPIC
@@ -214,9 +214,9 @@
install-lib: all
@@ -238,9 +238,9 @@
install-lib: libfdt
@$(VECHO) INSTALL-LIB
$(INSTALL) -d $(DESTDIR)$(LIBDIR)
- $(INSTALL_LIB) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)
Expand All @@ -34,7 +34,7 @@
$(INSTALL_DATA) $(LIBFDT_archive) $(DESTDIR)$(LIBDIR)

install-includes:
@@ -267,7 +267,7 @@
@@ -291,7 +291,7 @@
include $(PYLIBFDT_dir)/Makefile.pylibfdt

.PHONY: pylibfdt
Expand All @@ -56,20 +56,20 @@
PYLIBFDT_CLEANFILES = $(PYLIBFDT_CLEANFILES_L:%=$(PYLIBFDT_dir)/%)
PYLIBFDT_CLEANDIRS_L = build __pycache__
PYLIBFDT_CLEANDIRS = $(PYLIBFDT_CLEANDIRS_L:%=$(PYLIBFDT_dir)/%)
--- dtc-1.5.0/libfdt/Makefile.libfdt.orig 2019-07-17 11:09:41.925082500 +0300
+++ dtc-1.5.0/libfdt/Makefile.libfdt 2019-07-17 11:10:04.701122500 +0300
@@ -3,13 +3,13 @@
# This is not a complete Makefile of itself. Instead, it is designed to
# be easily embeddable into other systems of Makefiles.
--- dtc-1.7.2/libfdt/Makefile.libfdt.orig 2024-12-17 08:17:19.871970100 +0100
+++ dtc-1.7.2/libfdt/Makefile.libfdt 2024-12-17 08:18:46.120273700 +0100
@@ -6,13 +6,13 @@
#

LIBFDT_so = libfdt.$(SHAREDLIB_EXT)
-LIBFDT_soname = libfdt.$(SHAREDLIB_EXT).1
+LIBFDT_soname = libfdt.$(SHAREDLIB_EXT).a
LIBFDT_INCLUDES = fdt.h libfdt.h libfdt_env.h
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_check.c
LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o)
-LIBFDT_LIB = libfdt-$(DTC_VERSION).$(SHAREDLIB_EXT)
-LIBFDT_LIB = libfdt.$(SHAREDLIB_EXT).$(DTC_VERSION)
+LIBFDT_LIB = libfdt.$(SHAREDLIB_EXT)

libfdt_clean:
Expand Down
10 changes: 5 additions & 5 deletions dtc/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Maintainer: Andy Gross <[email protected]>

pkgname=dtc
pkgver=1.7.0
pkgrel=3
pkgver=1.7.2
pkgrel=1
pkgdesc="Device Tree Compiler"
arch=('i686' 'x86_64')
url="https://git.kernel.org/pub/scm/utils/dtc/dtc/git"
Expand All @@ -12,12 +12,12 @@ msys2_references=(
)
license=('GPL2')
depends=('libyaml')
makedepends=('python-devel' 'swig' 'libyaml-devel' 'gcc' 'python-setuptools-scm')
makedepends=('python-devel' 'swig' 'libyaml-devel' 'gcc' 'python-setuptools-scm' 'pkgconf')
source=("https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/${pkgname}-${pkgver}.tar.gz"
01-correct-shared-library-extension.patch
02-pyext-install.patch)
sha256sums=('70d9c156ec86d63de0f7bdae50540ffa492b25ec1d69491c7520845c860b9a62'
'c0dd05748bac0d5fd859c9684da58b44acdbc2ac359642c630c75bcec8cbb84d'
sha256sums=('8f1486962f093f28a2f79f01c1fd82f144ef640ceabe555536d43362212ceb7c'
'ac65df904e09681cd5a4c12a063a91ce7055fdd24748fde6519c433ced480861'
'0135724ce6f5a30a381d2097bc6afa561168bdc16c42608fcc34c3990fa5b990')

prepare() {
Expand Down

0 comments on commit 6f0e101

Please sign in to comment.