diff options
| author |   Mikle Kolyada <zlogene@gentoo.org> | 2019-11-22 12:47:17 +0300 |
|---|---|---|
| committer | Mikle Kolyada <zlogene@gentoo.org> | 2019-11-22 12:47:17 +0300 |
| commit | a89743c14b67fa2507926ad8d0aea43b5b8712b0 (patch) | |
| tree | a92b73f7453b9cdb1caa3bedb575531c057e4680 /app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch | |
| parent | app-text/mupdf: arm stable wrt bug #699980 (diff) | |
| download | gentoo-a89743c14b67fa2507926ad8d0aea43b5b8712b0.tar.gz gentoo-a89743c14b67fa2507926ad8d0aea43b5b8712b0.tar.bz2 gentoo-a89743c14b67fa2507926ad8d0aea43b5b8712b0.zip | |
app-text/mupdf: cleanup
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
Diffstat (limited to 'app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch')
| -rw-r--r-- | app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch deleted file mode 100644 index 79efe32c0e41..000000000000 --- a/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/Makerules b/Makerules -index fc9bf998..f1fd93cb 100644 ---- a/Makerules -+++ b/Makerules -@@ -113,10 +113,11 @@ else ifeq ($(OS),Linux) - SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib) - endif - -- HAVE_CURL := $(shell pkg-config --exists libcurl && echo yes) -+ HAVE_CURL ?= not-unless-portage-tells-me - ifeq ($(HAVE_CURL),yes) - SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) -- SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) -+ # We have to forcibly add -lpthread to avoid linking errors. -+ SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) -lpthread - endif - - HAVE_GLUT := yes -@@ -125,13 +126,14 @@ else ifeq ($(OS),Linux) - SYS_GLUT_LIBS := -lglut -lGL - endif - -- HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) -+ HAVE_X11 ?= not-unless-portage-tells-me - ifeq ($(HAVE_X11),yes) - X11_CFLAGS := $(shell pkg-config --cflags x11 xext) - X11_LIBS := $(shell pkg-config --libs x11 xext) - endif - -- HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) -+ -+ HAVE_LIBCRYPTO ?= not-unless-portage-tells-me - ifeq ($(HAVE_LIBCRYPTO),yes) - LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO - LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) |