Archives
Archives
| From: | "Julian Ospald (hasufell)" <hasufell@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in app-text/blahtexml/files: blahtexml-0.9-Makefile.patch |
| Date: | Thu, 26 Dec 2013 14:40:50 |
| Message-Id: | 20131226144045.C02832004C@flycatcher.gentoo.org |
| 1 | hasufell 13/12/26 14:40:45 |
| 2 | |
| 3 | Modified: blahtexml-0.9-Makefile.patch |
| 4 | Log: |
| 5 | respect PKG_CONFIG wrt #478514, add ~x86 |
| 6 | |
| 7 | (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.2 app-text/blahtexml/files/blahtexml-0.9-Makefile.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/blahtexml/files/blahtexml-0.9-Makefile.patch?rev=1.2&view=markup |
| 13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/blahtexml/files/blahtexml-0.9-Makefile.patch?rev=1.2&content-type=text/plain |
| 14 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/blahtexml/files/blahtexml-0.9-Makefile.patch?r1=1.1&r2=1.2 |
| 15 | |
| 16 | Index: blahtexml-0.9-Makefile.patch |
| 17 | =================================================================== |
| 18 | RCS file: /var/cvsroot/gentoo-x86/app-text/blahtexml/files/blahtexml-0.9-Makefile.patch,v |
| 19 | retrieving revision 1.1 |
| 20 | retrieving revision 1.2 |
| 21 | diff -u -r1.1 -r1.2 |
| 22 | --- blahtexml-0.9-Makefile.patch 10 Jul 2013 11:45:01 -0000 1.1 |
| 23 | +++ blahtexml-0.9-Makefile.patch 26 Dec 2013 14:40:45 -0000 1.2 |
| 24 | @@ -2,22 +2,24 @@ |
| 25 | Respect CXX and CC |
| 26 | Replace CFLAGS with CXXFLAGS where needed |
| 27 | Add LDFLAGS |
| 28 | ---- makefile.old 2010-04-07 18:45:30.000000000 +0200 |
| 29 | -+++ makefile 2012-08-15 23:48:03.218394478 +0200 |
| 30 | -@@ -93,35 +93,39 @@ |
| 31 | + |
| 32 | +--- a/makefile |
| 33 | ++++ b/makefile |
| 34 | +@@ -93,35 +93,40 @@ |
| 35 | |
| 36 | $(BINDIR_XMLIN)/InputSymbolTranslation.o: InputSymbolTranslation.cpp InputSymbolTranslation.inc |
| 37 | |
| 38 | -CFLAGS = -O2 |
| 39 | ++PKG_CONFIG ?= pkg-config |
| 40 | +CFLAGS ?= -O2 |
| 41 | |
| 42 | VPATH = Source:Source/BlahtexCore:Source/BlahtexXMLin |
| 43 | |
| 44 | INCLUDES=-I. -ISource -ISource/BlahtexCore -ISource/BlahtexXMLin |
| 45 | |
| 46 | -+CXXFLAGS += $(shell pkg-config --cflags xerces-c) |
| 47 | ++CXXFLAGS += $(shell $(PKG_CONFIG) --cflags xerces-c) |
| 48 | + |
| 49 | -+XERCES_LIB = $(shell pkg-config --libs xerces-c) |
| 50 | ++XERCES_LIB = $(shell $(PKG_CONFIG) --libs xerces-c) |
| 51 | + |
| 52 | $(BINDIR)/%.o:%.cpp |
| 53 | - $(CXX) $(INCLUDES) $(CFLAGS) -c $< -o $@ |