[gentoo-commits] gentoo-x86 commit in media-libs/imlib2/files: imlib2-1.4.6-no-x.patch

[Mike Frysinger (vapier)]

vapier      14/07/29 03:29:38

  Added:                imlib2-1.4.6-no-x.patch
  Log:
  Fix builds with USE=-X #517670 by Laurent Bachelier.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

Revision  Changes    Path
1.1                  media-libs/imlib2/files/imlib2-1.4.6-no-x.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/files/imlib2-1.4.6-no-x.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/files/imlib2-1.4.6-no-x.patch?rev=1.1&content-type=text/plain

Index: imlib2-1.4.6-no-x.patch
===================================================================
https://bugs.gentoo.org/517670

already in upstream

From 3e6ca0b48d2b07980c310935ad1a8dde209efed5 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@g.o>
Date: Mon, 28 Jul 2014 23:01:23 -0400
Subject: [PATCH] do not link with X libs when X is disabled

Signed-off-by: Mike Frysinger <vapier@g.o>
---
 src/lib/Makefile.am | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index b03f753..93c708f 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -84,7 +84,10 @@ AMD64_OBJS = $(AMD64_SRCS:.S=.lo)
 
 EXTRA_DIST = $(MMX_SRCS) $(AMD64_SRCS) asm_loadimmq.S
 
-MY_LIBS = -lXext -lX11 $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm
+MY_LIBS = $(FREETYPE_LIBS) $(DLOPEN_LIBS) -lm
+if BUILD_X11
+MY_LIBS += -lXext -lX11
+endif
 
 if BUILD_MMX
 libImlib2_la_LIBADD       = $(MMX_OBJS) $(MY_LIBS)
-- 
2.0.0