From: | "Kacper Kowalik (xarthisius)" <xarthisius@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in sci-astronomy/esorex/files: esorex-3.8.3-cfitsio.patch |
Date: | Sun, 03 Oct 2010 08:25:00 |
Message-Id: | 20101003082455.EF92B20051@flycatcher.gentoo.org |
1 | xarthisius 10/10/03 08:24:55 |
2 | |
3 | Added: esorex-3.8.3-cfitsio.patch |
4 | Log: |
5 | Use pkg-config for cfitsio wrt bug 339460. Thanks to Diego for the report. Drop old. |
6 | |
7 | (Portage version: 2.1.9/cvs/Linux x86_64) |
8 | |
9 | Revision Changes Path |
10 | 1.1 sci-astronomy/esorex/files/esorex-3.8.3-cfitsio.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-astronomy/esorex/files/esorex-3.8.3-cfitsio.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-astronomy/esorex/files/esorex-3.8.3-cfitsio.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: esorex-3.8.3-cfitsio.patch |
16 | =================================================================== |
17 | Use pkg-config for cfitsio |
18 | |
19 | http://bugs.gentoo.org/show_bug.cgi?id=339460 |
20 | |
21 | --- configure.ac |
22 | +++ configure.ac |
23 | @@ -69,7 +69,7 @@ |
24 | ESOREX_FUNC_GETOPT |
25 | |
26 | # Check for CPL/CFITSIO presence and usability |
27 | -CPL_CHECK_CFITSIO |
28 | +PKG_CHECK_MODULES([CFITSIO], [cfitsio >= 3.09]) |
29 | #CPL_CHECK_CEXT |
30 | CPL_CHECK_LIBS |
31 | ESO_CHECK_EXTRA_LIBS |
32 | --- src/Makefile.am |
33 | +++ src/Makefile.am |
34 | @@ -33,7 +33,7 @@ |
35 | |
36 | CPPFLAGS = -DCX_LOG_DOMAIN=\"EsoRex\" |
37 | |
38 | -INCLUDES = $(CFITSIO_INCLUDES) $(CPL_INCLUDES) $(CX_INCLUDES) $(INCLTDL) |
39 | +INCLUDES = $(CFITSIO_CFLAGS) $(CPL_INCLUDES) $(CX_INCLUDES) $(INCLTDL) |
40 | |
41 | noinst_HEADERS = er_fileutils.h er_help.h er_main.h er_params.h \ |
42 | er_paramutils.h er_plugin.h er_pluginlist.h \ |
43 | @@ -51,8 +51,8 @@ |
44 | |
45 | config_DATA = |
46 | |
47 | -esorex_LDFLAGS = $(CPL_LDFLAGS) $(CFITSIO_LDFLAGS) $(LIBLTDL) |
48 | -esorex_LDADD = @GETOPT@ $(LIBCPLUI) $(LIBCPLDFS) $(LIBLTDL) |
49 | +esorex_LDFLAGS = $(CPL_LDFLAGS) $(LIBLTDL) |
50 | +esorex_LDADD = @GETOPT@ $(CFITSIO_LIBS) $(LIBCPLUI) $(LIBCPLDFS) $(LIBLTDL) |
51 | esorex_DEPENDENCIES = @GETOPT@ $(LIBLTDL) |
52 | |
53 | if PURIFY |