55 lines
1.9 KiB
Text
55 lines
1.9 KiB
Text
|
Fix shared library versions.
|
||
|
|
|
||
|
|
Index: Makefile
|
||
|
|
--- Makefile.orig
|
||
|
|
+++ Makefile
|
||
|
|
@@ -22,8 +22,8 @@ ASSUME_MASK ?= 0
|
||
|
|
|
||
|
|
CPPFLAGS = -I libfdt -I . -DFDT_ASSUME_MASK=$(ASSUME_MASK)
|
||
|
|
WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
|
||
|
|
- -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow
|
||
|
|
-CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS) $(EXTRA_CFLAGS)
|
||
|
|
+ -Wstrict-prototypes -Wmissing-prototypes -Wshadow
|
||
|
|
+CFLAGS += $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS) $(EXTRA_CFLAGS)
|
||
|
|
|
||
|
|
BISON = bison
|
||
|
|
LEX = flex
|
||
|
|
@@ -73,7 +73,7 @@ SHAREDLIB_LDFLAGS = -shared -Wl,--version-script=$(LIB
|
||
|
|
else
|
||
|
|
SHAREDLIB_EXT = so
|
||
|
|
SHAREDLIB_CFLAGS = -fPIC
|
||
|
|
-SHAREDLIB_LDFLAGS = -fPIC -shared -Wl,--version-script=$(LIBFDT_version) -Wl,-soname,
|
||
|
|
+SHAREDLIB_LDFLAGS = -fPIC -shared -Wl,--version-script=$(LIBFDT_version)
|
||
|
|
endif
|
||
|
|
|
||
|
|
#
|
||
|
|
@@ -158,7 +158,7 @@ all: $(BIN) libfdt
|
||
|
|
check_python_deps = \
|
||
|
|
if $(PKG_CONFIG) --cflags $(PYTHON) >/dev/null 2>&1; then \
|
||
|
|
if which swig >/dev/null 2>&1; then \
|
||
|
|
- can_build=yes; \
|
||
|
|
+ can_build=no; \
|
||
|
|
fi; \
|
||
|
|
fi; \
|
||
|
|
if [ "$${can_build}" = "yes" ]; then \
|
||
|
|
@@ -207,9 +207,8 @@ $(LIBFDT_archive): $(addprefix $(LIBFDT_dir)/,$(LIBFDT
|
||
|
|
|
||
|
|
$(LIBFDT_lib): $(addprefix $(LIBFDT_dir)/,$(LIBFDT_OBJS)) $(LIBFDT_version)
|
||
|
|
@$(VECHO) LD $@
|
||
|
|
- $(CC) $(LDFLAGS) $(SHAREDLIB_LDFLAGS)$(LIBFDT_soname) -o $(LIBFDT_lib) \
|
||
|
|
+ $(CC) $(LDFLAGS) $(SHAREDLIB_LDFLAGS) -o $(LIBFDT_lib) \
|
||
|
|
$(addprefix $(LIBFDT_dir)/,$(LIBFDT_OBJS))
|
||
|
|
- ln -sf $(LIBFDT_LIB) $(LIBFDT_dir)/$(LIBFDT_soname)
|
||
|
|
|
||
|
|
ifneq ($(DEPTARGETS),)
|
||
|
|
-include $(LIBFDT_OBJS:%.o=$(LIBFDT_dir)/%.d)
|
||
|
|
@@ -230,8 +229,6 @@ 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_DATA) $(LIBFDT_archive) $(DESTDIR)$(LIBDIR)
|
||
|
|
|
||
|
|
install-includes:
|