| 1 |
jlec 13/03/01 12:18:25 |
| 2 |
|
| 3 |
Added: gsl-shell-2.2.0-pkg-config.patch |
| 4 |
Log: |
| 5 |
sci-mathematics/gsl-shell: Use pkg-config to detect gsl, libagg, freetype (#459474) and fox |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 70EB7916) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-mathematics/gsl-shell/files/gsl-shell-2.2.0-pkg-config.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/gsl-shell/files/gsl-shell-2.2.0-pkg-config.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/gsl-shell/files/gsl-shell-2.2.0-pkg-config.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gsl-shell-2.2.0-pkg-config.patch |
| 16 |
=================================================================== |
| 17 |
makepackages | 16 ++++++++-------- |
| 18 |
1 file changed, 8 insertions(+), 8 deletions(-) |
| 19 |
|
| 20 |
diff --git a/makepackages b/makepackages |
| 21 |
index afeef79..a724e82 100644 |
| 22 |
--- a/makepackages |
| 23 |
+++ b/makepackages |
| 24 |
@@ -52,17 +52,17 @@ else |
| 25 |
PTHREADS_LIBS = -lpthread |
| 26 |
|
| 27 |
else |
| 28 |
- AGG_INCLUDES = -I/usr/include/agg2 |
| 29 |
- AGG_LIBS = -lagg -lX11 |
| 30 |
+ AGG_INCLUDES = $(shell $(PKG_CONFIG) --cflags libagg) |
| 31 |
+ AGG_LIBS = $(shell $(PKG_CONFIG) --libs libagg) -lX11 |
| 32 |
|
| 33 |
- GSL_INCLUDES = |
| 34 |
- GSL_LIBS = -lgsl -lblas |
| 35 |
+ GSL_INCLUDES = $(shell $(PKG_CONFIG) --cflags gsl) |
| 36 |
+ GSL_LIBS = $(shell $(PKG_CONFIG) --libs gsl) |
| 37 |
|
| 38 |
- FOX_INCLUDES := $(shell pkg-config fox --cflags) |
| 39 |
- FOX_LIBS = $(shell pkg-config fox --libs) |
| 40 |
+ FOX_INCLUDES := $(shell $(PKG_CONFIG) fox --cflags) |
| 41 |
+ FOX_LIBS = $(shell $(PKG_CONFIG) fox --libs) |
| 42 |
|
| 43 |
- FREETYPE_INCLUDES = -I/usr/include/freetype2 |
| 44 |
- FREETYPE_LIBS = -lfreetype |
| 45 |
+ FREETYPE_INCLUDES = $(shell $(PKG_CONFIG) --cflags freetype2) |
| 46 |
+ FREETYPE_LIBS = $(shell $(PKG_CONFIG) --libs freetype2) |
| 47 |
|
| 48 |
PTHREADS_LIBS = -lpthread |
| 49 |
endif |
Archives