79 lines
3.1 KiB
Diff
79 lines
3.1 KiB
Diff
--- 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
|
|
-CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS)
|
|
+CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) $(WARNINGS)
|
|
|
|
BISON = bison
|
|
LEX = flex
|
|
@@ -59,9 +59,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,
|
|
+SHAREDLIB_LDFLAGS = -shared -Wl,--version-script=$(LIBFDT_version) -Wl,--out-implib,
|
|
else
|
|
SHAREDLIB_EXT = so
|
|
SHAREDLIB_CFLAGS = -fPIC
|
|
@@ -184,7 +184,7 @@
|
|
#
|
|
LIBFDT_dir = libfdt
|
|
LIBFDT_archive = $(LIBFDT_dir)/libfdt.a
|
|
-LIBFDT_lib = $(LIBFDT_dir)/libfdt-$(DTC_VERSION).$(SHAREDLIB_EXT)
|
|
+LIBFDT_lib = $(LIBFDT_dir)/libfdt.$(SHAREDLIB_EXT)
|
|
LIBFDT_include = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_INCLUDES))
|
|
LIBFDT_version = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_VERSION))
|
|
|
|
@@ -214,9 +214,9 @@
|
|
install-lib: all
|
|
@$(VECHO) INSTALL-LIB
|
|
$(INSTALL) -d $(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) -d $(DESTDIR)$(BINDIR)
|
|
+ $(INSTALL_LIB) $(LIBFDT_lib) $(DESTDIR)$(BINDIR)
|
|
+ $(INSTALL_LIB) $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)
|
|
$(INSTALL_DATA) $(LIBFDT_archive) $(DESTDIR)$(LIBDIR)
|
|
|
|
install-includes:
|
|
@@ -267,7 +267,7 @@
|
|
include $(PYLIBFDT_dir)/Makefile.pylibfdt
|
|
|
|
.PHONY: pylibfdt
|
|
-pylibfdt: $(PYLIBFDT_dir)/_libfdt.so
|
|
+pylibfdt: $(PYLIBFDT_dir)/_libfdt.$(SHAREDLIB_EXT)
|
|
|
|
#
|
|
# Release signing and uploading
|
|
--- dtc-1.5.0/pylibfdt/Makefile.pylibfdt.orig 2019-04-25 08:39:00.773172800 +0300
|
|
+++ dtc-1.5.0/pylibfdt/Makefile.pylibfdt 2019-04-25 08:42:12.651441900 +0300
|
|
@@ -2,8 +2,8 @@
|
|
#
|
|
|
|
PYLIBFDT_srcs = $(PYLIBFDT_dir)/libfdt.i
|
|
-PYMODULE = $(PYLIBFDT_dir)/_libfdt.so
|
|
-PYLIBFDT_CLEANFILES_L = libfdt_wrap.c libfdt.py *.pyc *.so
|
|
+PYMODULE = $(PYLIBFDT_dir)/_libfdt.$(SHAREDLIB_EXT)
|
|
+PYLIBFDT_CLEANFILES_L = libfdt_wrap.c libfdt.py *.pyc *.$(SHAREDLIB_EXT)
|
|
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,7 +3,7 @@
|
|
# This is not a complete Makefile of itself. Instead, it is designed to
|
|
# be easily embeddable into other systems of Makefiles.
|
|
#
|
|
-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 \
|