c323439945
Also patched to fix operation on strict alignment archs: this fixes libvpx on alpha/arm/hppa/mips64/sparc/sparc64. from Brad (maintainer)
47 lines
2.0 KiB
Plaintext
47 lines
2.0 KiB
Plaintext
$OpenBSD: patch-libs_mk,v 1.5 2012/05/22 18:22:50 ajacoutot Exp $
|
|
--- libs.mk.orig Tue May 8 19:14:00 2012
|
|
+++ libs.mk Wed May 16 17:07:35 2012
|
|
@@ -193,16 +193,11 @@ LIBS-$(if $(BUILD_LIBVPX),$(CONFIG_STATIC)) += $(BUILD
|
|
$(BUILD_PFX)libvpx_g.a: $(LIBVPX_OBJS)
|
|
|
|
BUILD_LIBVPX_SO := $(if $(BUILD_LIBVPX),$(CONFIG_SHARED))
|
|
-LIBVPX_SO := libvpx.so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)
|
|
-LIBS-$(BUILD_LIBVPX_SO) += $(BUILD_PFX)$(LIBVPX_SO)\
|
|
- $(notdir $(LIBVPX_SO_SYMLINKS))
|
|
+LIBVPX_SO := libvpx.so.$(LIBVPX_VERSION)
|
|
+LIBS-$(BUILD_LIBVPX_SO) += $(BUILD_PFX)$(LIBVPX_SO)
|
|
$(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) libvpx.ver
|
|
$(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm
|
|
-$(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.so.$(VERSION_MAJOR)
|
|
$(BUILD_PFX)$(LIBVPX_SO): SO_VERSION_SCRIPT = libvpx.ver
|
|
-LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \
|
|
- libvpx.so libvpx.so.$(VERSION_MAJOR) \
|
|
- libvpx.so.$(VERSION_MAJOR).$(VERSION_MINOR))
|
|
|
|
libvpx.ver: $(call enabled,CODEC_EXPORTS)
|
|
@echo " [CREATE] $@"
|
|
@@ -217,14 +212,6 @@ $(1): $(2)
|
|
$(qexec)ln -sf $(LIBVPX_SO) $$@
|
|
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)),\
|
|
- $(DIST_DIR)/$(LIBSUBDIR)/$(LIBVPX_SO)))
|
|
-
|
|
-INSTALL-LIBS-$(CONFIG_SHARED) += $(LIBVPX_SO_SYMLINKS)
|
|
INSTALL-LIBS-$(CONFIG_SHARED) += $(LIBSUBDIR)/$(LIBVPX_SO)
|
|
|
|
LIBS-$(BUILD_LIBVPX) += vpx.pc
|
|
@@ -241,7 +228,7 @@ vpx.pc: config.mk libs.mk
|
|
$(qexec)echo 'Version: $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)' >> $@
|
|
$(qexec)echo 'Requires:' >> $@
|
|
$(qexec)echo 'Conflicts:' >> $@
|
|
- $(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@
|
|
+ $(qexec)echo 'Libs: -L$${libdir} -lvpx -pthread' >> $@
|
|
$(qexec)echo 'Cflags: -I$${includedir}' >> $@
|
|
INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
|
|
INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc
|