Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/cgcode/files: 1.0-gentoo.patch
Date: Sun, 31 Oct 2010 10:37:32
Message-Id: 20101031103729.DB4C420054@flycatcher.gentoo.org
1 jlec 10/10/31 10:37:29
2
3 Added: 1.0-gentoo.patch
4 Log:
5 New addition
6
7 (Portage version: 2.2.0_alpha2/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 sci-libs/cgcode/files/1.0-gentoo.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cgcode/files/1.0-gentoo.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/cgcode/files/1.0-gentoo.patch?rev=1.1&content-type=text/plain
14
15 Index: 1.0-gentoo.patch
16 ===================================================================
17 diff --git a/makefile b/makefile
18 index 4813b55..f20af02 100644
19 --- a/makefile
20 +++ b/makefile
21 @@ -1,21 +1,23 @@
22
23 include make.inc
24
25 -THELIBS = libcgcode.a libblas_mini.a
26 +THELIBS = -lcgcode
27
28 default : goos good
29
30 -libs :
31 - cd src ; make ; cd ../util ; make
32 +libs : src/libcgcode.so
33 +
34 +src/libcgcode.so:
35 + $(MAKE) -C src
36
37 goos : mains.o libs
38 - $(F77) $(DEBUG) $(OFLAGS) $(LFLAGS) mains.o $(THELIBS) -o goos
39 + $(F77) $(LDFLAGS) mains.o -L. $(THELIBS) $(BLASLIBS) -o goos
40
41 good : maind.o libs
42 - $(F77) $(DEBUG) $(OFLAGS) $(LFLAGS) maind.o $(THELIBS) -o good
43 + $(F77) $(LDFLAGS) maind.o -L. $(THELIBS) $(BLASLIBS) -o good
44
45 -.f.o :
46 - $(F77) $(CFLAGS) $(DEBUG) $(OFLAGS) $*$ .f
47 +%.o : %.f
48 + $(F77) $(FFLAGS) -c $<
49
50 clean :
51 rm -f *.o goos good
52 diff --git a/src/makefile b/src/makefile
53 index 10cf6c3..1dfd02d 100644
54 --- a/src/makefile
55 +++ b/src/makefile
56 @@ -1,16 +1,17 @@
57
58 include ../make.inc
59
60 -THISLIB = libcgcode.a
61 +THISLIB = libcgcode.so
62 SOBJLIB = scgdrv.o scg.o scr.o scrind.o spcg.o scgnr.o scgne.o spcgnr.o spcgne.o sppcg.o spcgca.o sdpchb.o scbfix.o sckchb.o scgchk.o sonest.o msstop.o r1mach.o sratqr.o
63 DOBJLIB = dcgdrv.o dcg.o dcr.o dcrind.o dpcg.o dcgnr.o dcgne.o dpcgnr.o dpcgne.o dppcg.o dpcgca.o ddpchb.o dcbfix.o dckchb.o dcgchk.o donest.o mdstop.o d1mach.o dratqr.o depsln.o
64
65 $(THISLIB) : $(SOBJLIB) $(DOBJLIB)
66 - $(AR) $(THISLIB) $(SOBJLIB) $(DOBJLIB)
67 - cp $(THISLIB) ../.
68 + $(F77) $(FFLAGS) $(LDFLAGS) -shared -fPIC -Wl,--soname,$(THISLIB).1 -o $(THISLIB).1.0 $(SOBJLIB) $(DOBJLIB)
69 + ln -sf $(THISLIB).1.0 $(THISLIB)
70 + cp $(THISLIB)* ../.
71
72 -.f.o :
73 - $(F77) $(CFLAGS) $(DEBUG) $(OFLAGS) $*$ .f
74 +%.o : %.f
75 + $(F77) $(FFLAGS) -fPIC -c $<
76
77 clean :
78 rm -f *.o $(THISLIB)
79 diff --git a/util/makefile b/util/makefile
80 index 6dad0d1..5c9d24f 100644
81 --- a/util/makefile
82 +++ b/util/makefile
83 @@ -6,11 +6,12 @@ SOBJLIB = saxpy.o scopy.o sdot.o snrm2.o sscal.o
84 DOBJLIB = daxpy.o dcopy.o ddot.o dnrm2.o dscal.o
85
86 $(THISLIB) : $(SOBJLIB) $(DOBJLIB)
87 - $(AR) $(THISLIB) $(SOBJLIB) $(DOBJLIB)
88 - cp $(THISLIB) ../.
89 + $(F77) $(FFLAGS) $(LDFLAGS) -shared -Wl,--soname,$(THISLIB).1 -o $(THISLIB).1.0 $(SOBJLIB) $(DOBJLIB)
90 + ln -sf $(THISLIB).1.0 $(THISLIB)
91 + cp $(THISLIB)* ../.
92
93 -.f.o :
94 - $(F77) $(CFLAGS) $(DEBUG) $(OFLAGS) $*$ .f
95 +%.o : %.f
96 + $(F77) $(FFLAGS) -c $<
97
98 clean :
99 rm -f *.o $(THISLIB)