diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2017-05-02 12:22:21 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2017-05-02 12:22:21 +0000 |
| commit | fb788017cd8925a764a0a085f3bc0ef0d455e390 (patch) | |
| tree | 0b0dbccf2d6bbac14a450789e20337f9cd5bfbf6 /graphics/mupdf/files/patch-Makefile | |
| parent | Update to 1.1 (diff) | |
Update to 1.11
- Prevent linking with libcrypto when a pkg-config file for it exists
on the system [1]
- Bump PORTREVISION of dependent ports
PR: 218996, 218688 [1]
Reported by: rsmith@xs4all.nl [1]
Submitted by: Zsolt Udvari <udvzsolt@gmail.com> (maintainer)
Approved by: lme (mentor)
Differential Revision: https://reviews.freebsd.org/D10561
Diffstat (limited to 'graphics/mupdf/files/patch-Makefile')
| -rw-r--r-- | graphics/mupdf/files/patch-Makefile | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/graphics/mupdf/files/patch-Makefile b/graphics/mupdf/files/patch-Makefile index 0d2857e150c3..6a1e04efe791 100644 --- a/graphics/mupdf/files/patch-Makefile +++ b/graphics/mupdf/files/patch-Makefile @@ -1,7 +1,7 @@ $OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $ ---- Makefile.orig 2016-11-28 13:34:04 UTC +--- Makefile.orig 2017-04-05 11:02:21 UTC +++ Makefile -@@ -152,14 +152,17 @@ $(FONT_GEN_SIL) : $(FONT_BIN_SIL) +@@ -300,8 +300,8 @@ generate: $(JAVASCRIPT_GEN) # --- Library --- @@ -9,15 +9,18 @@ $OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $ -THIRD_LIB = $(OUT)/libmupdfthird.a +MUPDF_LIB = libmupdf.so.$(SOVERSION) +THIRD_LIB = libmupdfthird.so.$(SOVERSION) + THREAD_LIB = $(OUT)/libmuthreads.a MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ) - THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(JPEGXR_OBJ) $(LURATECH_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ) +@@ -309,7 +309,11 @@ THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_ + THREAD_OBJ := $(THREAD_OBJ) $(MUPDF_LIB) : $(MUPDF_OBJ) -+ $(CC) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $^ $(LIBS) ++ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -o $@ $^ $(LIBS) + $(THIRD_LIB) : $(THIRD_OBJ) -+ $(CC) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $^ $(LIBS) ++ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname=$@ -o $@ $^ $(LIBS) ++ + $(THREAD_LIB) : $(THREAD_OBJ) INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) - |