From: | "Sebastien Fabbro (bicatali)" <bicatali@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in sci-libs/cdf/files: cdf-3.2-Makefile.patch cdf-Makefile.patch cdf-soname.patch |
Date: | Mon, 02 Feb 2009 18:34:13 |
Message-Id: | E1LU3cW-0001Ht-C9@stork.gentoo.org |
1 | bicatali 09/02/02 18:34:08 |
2 | |
3 | Modified: cdf-3.2-Makefile.patch |
4 | Removed: cdf-Makefile.patch cdf-soname.patch |
5 | Log: |
6 | Version bump. Added LDFLAGS propagation, and link tools dynamically, closing bug #253251 |
7 | (Portage version: 2.2_rc23/cvs/Linux x86_64) |
8 | |
9 | Revision Changes Path |
10 | 1.2 sci-libs/cdf/files/cdf-3.2-Makefile.patch |
11 | |
12 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cdf/files/cdf-3.2-Makefile.patch?rev=1.2&view=markup |
13 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cdf/files/cdf-3.2-Makefile.patch?rev=1.2&content-type=text/plain |
14 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cdf/files/cdf-3.2-Makefile.patch?r1=1.1&r2=1.2 |
15 | |
16 | Index: cdf-3.2-Makefile.patch |
17 | =================================================================== |
18 | RCS file: /var/cvsroot/gentoo-x86/sci-libs/cdf/files/cdf-3.2-Makefile.patch,v |
19 | retrieving revision 1.1 |
20 | retrieving revision 1.2 |
21 | diff -u -r1.1 -r1.2 |
22 | --- cdf-3.2-Makefile.patch 3 Dec 2007 18:41:02 -0000 1.1 |
23 | +++ cdf-3.2-Makefile.patch 2 Feb 2009 18:34:08 -0000 1.2 |
24 | @@ -82,3 +82,19 @@ |
25 | @echo COPTIONSld=$(COPTIONSld_$(OS)_$(ENV)) |
26 | @echo CURSESLIB=$(CURSESLIB_$(OS)_$(ENV)) |
27 | @echo SYSLIBSexe=$(SYSLIBSexe_$(OS)_$(ENV)) |
28 | +--- src/tools/Makefile.orig 2009-02-02 18:02:55.000000000 +0000 |
29 | ++++ src/tools/Makefile 2009-02-02 18:07:31.000000000 +0000 |
30 | +@@ -35,10 +35,10 @@ |
31 | + INCLUDEcdf= ../include |
32 | + |
33 | + CC=$(CCx) |
34 | +-CFLAGS=$(COPTIONS) -I$(INCLUDEcdf) |
35 | +-CFLAGSld=$(COPTIONSld) |
36 | ++CFLAGS:= $(CFLAGS) $(COPTIONS) -I$(INCLUDEcdf) |
37 | ++CFLAGSld=$(LDFLAGS) $(COPTIONSld) |
38 | + |
39 | +-LIBCDFa=../lib/libcdf.a |
40 | ++LIBCDFa=../lib/libcdf.so.3 |
41 | + |
42 | + LIBs1=$(LIBCDFa) $(SYSLIBS) |
43 | + LIBs2=$(LIBCDFa) $(CURSESLIB) $(SYSLIBS) |