-
Notifications
You must be signed in to change notification settings - Fork 483
/
01-correct-shared-library-extension.patch
76 lines (70 loc) · 2.97 KB
/
01-correct-shared-library-extension.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
--- 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) $(EXTRA_CFLAGS)
+CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) $(WARNINGS) $(EXTRA_CFLAGS)
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
@@ -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,13 +3,13 @@
# 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 \
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)
libfdt_clean:
@$(VECHO) CLEAN "(libfdt)"