[gentoo-commits] gentoo-x86 commit in app-text/mupdf/files: mupdf-1.5-Makerules-openssl-curl.patch

[gentoo-commits] gentoo-x86 commit in app-text/mupdf/files: mupdf-1.5-Makerules-openssl-curl.patch

[Michael Weber (xmw)]

xmw         14/07/21 22:00:02

  Added:                mupdf-1.5-Makerules-openssl-curl.patch
  Log:
  Fix USE=-X for >1.4 (bug 514202, thanks patrick) and .so names, Version bump to 1.5, USE=openssl and curl for >=1.5.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

Revision  Changes    Path
1.1                  app-text/mupdf/files/mupdf-1.5-Makerules-openssl-curl.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/files/mupdf-1.5-Makerules-openssl-curl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/mupdf/files/mupdf-1.5-Makerules-openssl-curl.patch?rev=1.1&content-type=text/plain

Index: mupdf-1.5-Makerules-openssl-curl.patch
===================================================================
--- mupdf-1.5/Makerules
+++ mupdf-1.5/Makerules
@@ -58,17 +58,23 @@
 
 HAVE_X11 ?= yes
 
+WANT_OPENSSL ?= yes
+ifeq "$(WANT_OPENSSL)" "yes"
 ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes"
 SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL $(shell pkg-config --cflags libcrypto)
 SYS_OPENSSL_LIBS = $(shell pkg-config --libs libcrypto)
 endif
+endif
 
+WANT_CURL ?= yes
+ifeq "$(WANT_CURL)" "yes"
 ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
 HAVE_CURL = yes
 SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
 SYS_CURL_LIBS = $(shell pkg-config --libs libcurl)
-endif
 SYS_CURL_DEPS = -lpthread -lrt
+endif
+endif
 
 SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext)
 SYS_X11_LIBS = $(shell pkg-config --libs x11 xext)