| @@ -1,41 +1,26 @@ | | | @@ -1,41 +1,26 @@ |
1 | $NetBSD: patch-Makefile,v 1.2 2018/07/24 06:06:08 adam Exp $ | | 1 | $NetBSD: patch-Makefile,v 1.3 2023/03/30 13:50:20 ryoon Exp $ |
2 | | | 2 | |
3 | Use custom CFLAGS; do not fail on warnings. | | 3 | Use custom CFLAGS; do not fail on warnings. |
4 | Fix install_name on Darwin. | | 4 | Fix install_name on Darwin. |
5 | Link against shared library. | | 5 | Link against shared library. |
6 | | | 6 | |
7 | --- Makefile.orig 2018-07-23 03:00:50.000000000 +0000 | | 7 | --- Makefile.orig 2023-02-09 10:01:35.000000000 +0000 |
8 | +++ Makefile | | 8 | +++ Makefile |
9 | @@ -18,7 +18,7 @@ CONFIG_LOCALVERSION = | | 9 | @@ -23,7 +23,7 @@ ASSUME_MASK ?= 0 |
10 | CPPFLAGS = -I libfdt -I . | | 10 | CPPFLAGS = -I libfdt -I . -DFDT_ASSUME_MASK=$(ASSUME_MASK) |
11 | WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \ | | 11 | WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs -Wsign-compare \ |
12 | -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow | | 12 | -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow |
13 | -CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS) | | 13 | -CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS) $(EXTRA_CFLAGS) |
14 | +CFLAGS += $(SHAREDLIB_CFLAGS) $(WARNINGS) | | 14 | +CFLAGS = $(SHAREDLIB_CFLAGS) $(WARNINGS) $(EXTRA_CFLAGS) |
15 | | | 15 | |
16 | BISON = bison | | 16 | BISON = bison |
17 | LEX = flex | | 17 | LEX = flex |
18 | @@ -42,7 +42,7 @@ HOSTOS := $(shell uname -s | tr '[:upper | | 18 | @@ -65,7 +65,7 @@ endif |
19 | ifeq ($(HOSTOS),darwin) | | 19 | ifeq ($(HOSTOS),darwin) |
20 | SHAREDLIB_EXT = dylib | | 20 | SHAREDLIB_EXT = dylib |
21 | SHAREDLIB_CFLAGS = -fPIC | | 21 | SHAREDLIB_CFLAGS = -fPIC |
22 | -SHAREDLIB_LDFLAGS = -fPIC -dynamiclib -Wl,-install_name -Wl, | | 22 | -SHAREDLIB_LDFLAGS = -fPIC -dynamiclib -Wl,-install_name -Wl, |
23 | +SHAREDLIB_LDFLAGS = -fPIC -dynamiclib -Wl,-install_name -Wl,$(LIBDIR)/ | | 23 | +SHAREDLIB_LDFLAGS = -fPIC -dynamiclib -Wl,-install_name -Wl,$(LIBDIR)/ |
24 | else ifeq ($(HOSTOS),$(filter $(HOSTOS),msys cygwin)) | | 24 | else ifeq ($(HOSTOS),$(filter $(HOSTOS),msys cygwin)) |
25 | SHAREDLIB_EXT = so | | 25 | SHAREDLIB_EXT = so |
26 | SHAREDLIB_CFLAGS = | | 26 | SHAREDLIB_CFLAGS = |
27 | @@ -237,11 +237,11 @@ convert-dtsv0: $(CONVERT_OBJS) | | | |
28 | | | | |
29 | fdtdump: $(FDTDUMP_OBJS) | | | |
30 | | | | |
31 | -fdtget: $(FDTGET_OBJS) $(LIBFDT_archive) | | | |
32 | +fdtget: $(FDTGET_OBJS) $(LIBFDT_lib) | | | |
33 | | | | |
34 | -fdtput: $(FDTPUT_OBJS) $(LIBFDT_archive) | | | |
35 | +fdtput: $(FDTPUT_OBJS) $(LIBFDT_lib) | | | |
36 | | | | |
37 | -fdtoverlay: $(FDTOVERLAY_OBJS) $(LIBFDT_archive) | | | |
38 | +fdtoverlay: $(FDTOVERLAY_OBJS) $(LIBFDT_lib) | | | |
39 | | | | |
40 | dist: | | | |
41 | git archive --format=tar --prefix=dtc-$(dtc_version)/ HEAD \ | | | |