Date: Tue, 9 Oct 2018 07:04:11 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r481607 - in branches/2018Q4/graphics/mupdf: . files Message-ID: <201810090704.w9974Bh9088027@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Tue Oct 9 07:04:11 2018 New Revision: 481607 URL: https://svnweb.freebsd.org/changeset/ports/481607 Log: MFH: r481606 graphics/mupdf: Fix linking with libmupdf.so for third-party ports libmupdf.so references symbols from libmupdfthird.so but does not link directly against it. This is problematic for ports using the --as-needed linker option, such as graphics/zathura-pdf-mupdf (>= 0.3.3) due to Meson's defaults. zathura-pdf-mupdf itself does not reference symbols from libmupdfthird.so, and so despite being included in the linker arguments, libmupdfthird.so is not actually linked in. $ zathura --version error: Could not load plugin '/usr/local/lib/zathura/libpdf-mupdf.so' (/usr/local/lib/libmupdf.so.1.13.0: Undefined symbol "js_tointeger"). This is a consequence of us providing shared libraries in spite of upstream since r433550 to keep package sizes down, but not properly understanding the dependency between libmupdfthird and libmupdf. PR: 232059 Submitted by: Albert Ou <aou@eecs.berkeley.edu> Approved by: ports-secteam build/runtime fix blanket Modified: branches/2018Q4/graphics/mupdf/Makefile branches/2018Q4/graphics/mupdf/files/patch-Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/graphics/mupdf/Makefile ============================================================================== --- branches/2018Q4/graphics/mupdf/Makefile Tue Oct 9 07:01:53 2018 (r481606) +++ branches/2018Q4/graphics/mupdf/Makefile Tue Oct 9 07:04:11 2018 (r481607) @@ -4,7 +4,7 @@ PORTNAME= mupdf PORTVERSION= 1.13.0 DISTVERSIONSUFFIX= -source -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://www.mupdf.com/downloads/ \ Modified: branches/2018Q4/graphics/mupdf/files/patch-Makefile ============================================================================== --- branches/2018Q4/graphics/mupdf/files/patch-Makefile Tue Oct 9 07:01:53 2018 (r481606) +++ branches/2018Q4/graphics/mupdf/files/patch-Makefile Tue Oct 9 07:04:11 2018 (r481607) @@ -15,11 +15,12 @@ $OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 st @@ -344,7 +344,11 @@ THIRD_OBJ := \ THREAD_OBJ := $(THREAD_OBJ) - $(MUPDF_LIB) : $(MUPDF_OBJ) -+ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -o $@ $^ $(LIBS) +-$(MUPDF_LIB) : $(MUPDF_OBJ) ++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) ++ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -Wl,--no-undefined -o $@ $^ $(LIBS) + $(THIRD_LIB) : $(THIRD_OBJ) -+ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -o $@ $^ $(LIBS) ++ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -Wl,--no-undefined -o $@ $^ $(LIBS) + $(THREAD_LIB) : $(THREAD_OBJ)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810090704.w9974Bh9088027>