summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVirgil Dupras <vdupras@gentoo.org>2018-08-27 15:50:49 -0400
committerVirgil Dupras <vdupras@gentoo.org>2018-08-27 15:53:30 -0400
commitfaf6b578bd55a8010c3957e03901cc1dab35a328 (patch)
tree9c9ef3156632386bdd1320a68df3eb6ca0a5cc2b /app-text/mupdf/files
parentsys-devel/make: Use a non-blocking read with pselect to avoid hangs (diff)
downloadgentoo-faf6b578bd55a8010c3957e03901cc1dab35a328.tar.gz
gentoo-faf6b578bd55a8010c3957e03901cc1dab35a328.tar.bz2
gentoo-faf6b578bd55a8010c3957e03901cc1dab35a328.zip
app-text/mupdf: fix compilation with libressl
Patch from Jouni Kosonen Closes: https://bugs.gentoo.org/662352 Package-Manager: Portage-2.3.48, Repoman-2.3.10
Diffstat (limited to 'app-text/mupdf/files')
-rw-r--r--app-text/mupdf/files/mupdf-1.13-libressl.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/app-text/mupdf/files/mupdf-1.13-libressl.patch b/app-text/mupdf/files/mupdf-1.13-libressl.patch
new file mode 100644
index 000000000000..396a0e5b5db9
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.13-libressl.patch
@@ -0,0 +1,23 @@
+diff --git a/Makerules b/Makerules
+index f9b25d6..6c91c6c 100644
+--- a/Makerules
++++ b/Makerules
+@@ -106,11 +106,17 @@ SYS_GLUT_LIBS := -lglut -lGL
+
+ WANT_OPENSSL ?= yes
+ ifeq "$(WANT_OPENSSL)" "yes"
+-ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
++ifeq "$(shell pkg-config --exists 'libcrypto >= 2.0.0' && echo libre)" "libre"
++ifeq "$(shell pkg-config --exists 'libcrypto >= 2.7.0' && echo yes)" "yes"
+ HAVE_LIBCRYPTO := yes
+ SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
+ SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
+ endif
++else ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
++HAVE_LIBCRYPTO := yes
++SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
++SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
++endif
+ endif
+
+ WANT_CURL ?= yes