Revision: 26346
http://sourceforge.net/p/gar/code/26346
Author: dmichelsen
Date: 2018-01-31 15:14:40 +0000 (Wed, 31 Jan 2018)
Log Message:
-----------
brotli/trunk: Make libraries self-contained
Modified Paths:
--------------
csw/mgar/pkg/brotli/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/brotli/trunk/files/0001-Link-to-libbrotlicommon.so-to-avoid-unresolved-symbo.patch
Modified: csw/mgar/pkg/brotli/trunk/Makefile
===================================================================
--- csw/mgar/pkg/brotli/trunk/Makefile 2018-01-29 09:54:25 UTC (rev 26345)
+++ csw/mgar/pkg/brotli/trunk/Makefile 2018-01-31 15:14:40 UTC (rev 26346)
@@ -10,6 +10,8 @@
MASTER_SITES = https://github.com/google/brotli/archive/
DISTFILES = $(DISTNAME).tar.gz
+PATCHFILES += 0001-Link-to-libbrotlicommon.so-to-avoid-unresolved-symbo.patch
+
PACKAGES += CSWlibbrotlicommon1
SPKG_DESC_CSWlibbrotlicommon1 = Brotli compression format, libbrotlicommon.so.1
PKGFILES_CSWlibbrotlicommon1 += $(call pkgfiles_lib,libbrotlicommon.so.1)
@@ -17,10 +19,12 @@
PACKAGES += CSWlibbrotlidec1
SPKG_DESC_CSWlibbrotlidec1 = Brotli compression format, libbrotlidec.so.1
PKGFILES_CSWlibbrotlidec1 += $(call pkgfiles_lib,libbrotlidec.so.1)
+RUNTIME_DEP_PKGS_CSWlibbrotlidec1 += CSWlibbrotlicommon1
PACKAGES += CSWlibbrotlienc1
SPKG_DESC_CSWlibbrotlienc1 = Brotli compression format, libbrotlienc.so.1
PKGFILES_CSWlibbrotlienc1 += $(call pkgfiles_lib,libbrotlienc.so.1)
+RUNTIME_DEP_PKGS_CSWlibbrotlienc1 += CSWlibbrotlicommon1
PACKAGES += CSWlibbrotli-dev
SPKG_DESC_CSWlibbrotli-dev = Development files for libbrotlicommon.so.1,
libbrotlidec.so.1, libbrotlienc.so.1
Added:
csw/mgar/pkg/brotli/trunk/files/0001-Link-to-libbrotlicommon.so-to-avoid-unresolved-symbo.patch
===================================================================
---
csw/mgar/pkg/brotli/trunk/files/0001-Link-to-libbrotlicommon.so-to-avoid-unresolved-symbo.patch
(rev 0)
+++
csw/mgar/pkg/brotli/trunk/files/0001-Link-to-libbrotlicommon.so-to-avoid-unresolved-symbo.patch
2018-01-31 15:14:40 UTC (rev 26346)
@@ -0,0 +1,37 @@
+From fd51add9e4d7176e4b3c488e1108490693b8a915 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Wed, 31 Jan 2018 15:58:23 +0100
+Subject: [PATCH] Link to libbrotlicommon.so to avoid unresolved symbols
+
+---
+ Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index c4ced6d..8974cc6 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc subdir-objects
+ ACLOCAL_AMFLAGS = -I m4
+
+ # Actual ABI version is substituted by bootstrap
+-LIBBROTLI_VERSION_INFO = -version-info 0:0:0
++LIBBROTLI_VERSION_INFO = -version-info 1:2:0
+
+ bin_PROGRAMS = brotli
+ lib_LTLIBRARIES = libbrotlicommon.la libbrotlidec.la libbrotlienc.la
+@@ -22,9 +22,9 @@ brotli_LDADD = libbrotlidec.la libbrotlienc.la
libbrotlicommon.la -lm
+ libbrotlicommon_la_SOURCES = $(BROTLI_COMMON_C) $(BROTLI_COMMON_H)
+ libbrotlicommon_la_LDFLAGS = $(AM_LDFLAGS) $(LIBBROTLI_VERSION_INFO)
$(LDFLAGS)
+ libbrotlidec_la_SOURCES = $(BROTLI_DEC_C) $(BROTLI_DEC_H)
+-libbrotlidec_la_LDFLAGS = $(AM_LDFLAGS) $(LIBBROTLI_VERSION_INFO) $(LDFLAGS)
++libbrotlidec_la_LDFLAGS = $(AM_LDFLAGS) $(LIBBROTLI_VERSION_INFO) $(LDFLAGS)
-lbrotlicommon
+ libbrotlienc_la_SOURCES = $(BROTLI_ENC_C) $(BROTLI_ENC_H)
+-libbrotlienc_la_LDFLAGS = $(AM_LDFLAGS) $(LIBBROTLI_VERSION_INFO) $(LDFLAGS)
++libbrotlienc_la_LDFLAGS = $(AM_LDFLAGS) $(LIBBROTLI_VERSION_INFO) $(LDFLAGS)
-lbrotlicommon -lm
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = \
+--
+2.4.0
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
