56 lines
2.2 KiB
Plaintext
56 lines
2.2 KiB
Plaintext
$OpenBSD: patch-libs_mk,v 1.16 2018/09/26 07:14:28 ajacoutot Exp $
|
|
Index: libs.mk
|
|
--- libs.mk.orig
|
|
+++ libs.mk
|
|
@@ -115,10 +115,6 @@ endif
|
|
|
|
# Suppress -Wextra warnings in third party code.
|
|
$(BUILD_PFX)third_party/googletest/%.cc.o: CXXFLAGS += -Wno-missing-field-initializers
|
|
-# Suppress -Wextra warnings in first party code pending investigation.
|
|
-# https://bugs.chromium.org/p/webm/issues/detail?id=1069
|
|
-$(BUILD_PFX)vp8/encoder/onyx_if.c.o: CFLAGS += -Wno-unknown-warning-option -Wno-clobbered
|
|
-$(BUILD_PFX)vp8/decoder/onyxd_if.c.o: CFLAGS += -Wno-unknown-warning-option -Wno-clobbered
|
|
|
|
ifeq ($(CONFIG_MSVS),yes)
|
|
CODEC_LIB=$(if $(CONFIG_STATIC_MSVCRT),vpxmt,vpxmd)
|
|
@@ -256,22 +252,17 @@ EXPORT_FILE := libvpx.def
|
|
LIBVPX_SO_SYMLINKS :=
|
|
LIBVPX_SO_IMPLIB := libvpx_dll.a
|
|
else
|
|
-LIBVPX_SO := libvpx.so.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR).$(SO_VERSION_PATCH)
|
|
+LIBVPX_SO := libvpx.so.$(LIBVPX_VERSION)
|
|
SHARED_LIB_SUF := .so
|
|
EXPORT_FILE := libvpx.ver
|
|
-LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \
|
|
- libvpx.so libvpx.so.$(SO_VERSION_MAJOR) \
|
|
- libvpx.so.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR))
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
LIBS-$(CONFIG_SHARED) += $(BUILD_PFX)$(LIBVPX_SO)\
|
|
- $(notdir $(LIBVPX_SO_SYMLINKS)) \
|
|
$(if $(LIBVPX_SO_IMPLIB), $(BUILD_PFX)$(LIBVPX_SO_IMPLIB))
|
|
$(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) $(EXPORT_FILE)
|
|
$(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm
|
|
-$(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.so.$(SO_VERSION_MAJOR)
|
|
$(BUILD_PFX)$(LIBVPX_SO): EXPORTS_FILE = $(EXPORT_FILE)
|
|
|
|
libvpx.ver: $(call enabled,CODEC_EXPORTS)
|
|
@@ -306,15 +297,7 @@ $(1): $(2)
|
|
$(qexec)ln -sf $(2) $$@
|
|
endef
|
|
|
|
-$(eval $(call libvpx_symlink_template,\
|
|
- $(addprefix $(BUILD_PFX),$(notdir $(LIBVPX_SO_SYMLINKS))),\
|
|
- $(BUILD_PFX)$(LIBVPX_SO)))
|
|
-$(eval $(call libvpx_symlink_template,\
|
|
- $(addprefix $(DIST_DIR)/,$(LIBVPX_SO_SYMLINKS)),\
|
|
- $(LIBVPX_SO)))
|
|
|
|
-
|
|
-INSTALL-LIBS-$(CONFIG_SHARED) += $(LIBVPX_SO_SYMLINKS)
|
|
INSTALL-LIBS-$(CONFIG_SHARED) += $(LIBSUBDIR)/$(LIBVPX_SO)
|
|
INSTALL-LIBS-$(CONFIG_SHARED) += $(if $(LIBVPX_SO_IMPLIB),$(LIBSUBDIR)/$(LIBVPX_SO_IMPLIB))
|
|
|