/[gentoo-x86]/sci-libs/djbfft/files/djbfft-0.76-shared.patch
Gentoo

Contents of /sci-libs/djbfft/files/djbfft-0.76-shared.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download) (as text)
Fri Oct 10 20:27:43 2008 UTC (11 years, 4 months ago) by bicatali
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +1 -1 lines
File MIME type: text/x-diff
QA fixes: soname (closing bug #158373, missing header files, separate tests and library building, remove forced flags for x86.
(Portage version: 2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64)

1 --- djbfft-0.76/Makefile.orig 1999-09-30 22:25:58.000000000 +0200
2 +++ djbfft-0.76/Makefile 2004-01-17 17:21:37.236669242 +0100
3 @@ -2,6 +2,9 @@
4
5 SHELL=/bin/sh
6
7 +LIBPERMS=0644
8 +LIBDJBFFT=djbfft.a
9 +
10 default: it
11
12 4c0.c: \
13 @@ -569,8 +572,8 @@
14 ./compile 8v5.c
15
16 accuracy: \
17 -load accuracy.o djbfft.a math.lib
18 - ./load accuracy djbfft.a `cat math.lib`
19 +load accuracy.o $(LIBDJBFFT) math.lib
20 + ./load accuracy $(LIBDJBFFT) `cat math.lib`
21
22 accuracy.o: \
23 compile accuracy.c fftc4.h complex4.h real4.h fftc8.h complex8.h \
24 @@ -578,8 +581,8 @@
25 ./compile accuracy.c
26
27 accuracy2: \
28 -load accuracy2.o djbfft.a math.lib
29 - ./load accuracy2 djbfft.a `cat math.lib`
30 +load accuracy2.o $(LIBDJBFFT) math.lib
31 + ./load accuracy2 $(LIBDJBFFT) `cat math.lib`
32
33 accuracy2.o: \
34 compile accuracy2.c fftc4.h complex4.h real4.h fftc8.h complex8.h \
35 @@ -649,7 +652,7 @@
36 ) > compilebase
37 chmod 755 compilebase
38
39 -djbfft.a: \
40 +$(LIBDJBFFT): \
41 makelib 8sc.o 8u5.o 8u4.o 8u3.o 8u2.o 8u1.o 8u0.o 8mc.o 8c0.o 8c1.o \
42 8c2.o 8c3.o 8c4.o 8c5.o 8d0.o 8d1.o 8d2.o 8d3.o 8d4.o 8d5.o 8v5.o \
43 8v4.o 8v3.o 8v2.o 8v1.o 8v0.o 8mr.o 8r0.o 8r1.o 8r2.o 8r3.o 8r4.o \
44 @@ -657,7 +660,7 @@
45 4c1.o 4c2.o 4c3.o 4c4.o 4c5.o 4d0.o 4d1.o 4d2.o 4d3.o 4d4.o 4d5.o \
46 4v5.o 4v4.o 4v3.o 4v2.o 4v1.o 4v0.o 4mr.o 4r0.o 4r1.o 4r2.o 4r3.o \
47 4r4.o 4r5.o 4sr.o fftfreq.o
48 - ./makelib djbfft.a 8sc.o 8u5.o 8u4.o 8u3.o 8u2.o 8u1.o \
49 + ./makelib $(LIBDJBFFT) 8sc.o 8u5.o 8u4.o 8u3.o 8u2.o 8u1.o \
50 8u0.o 8mc.o 8c0.o 8c1.o 8c2.o 8c3.o 8c4.o 8c5.o 8d0.o 8d1.o \
51 8d2.o 8d3.o 8d4.o 8d5.o 8v5.o 8v4.o 8v3.o 8v2.o 8v1.o 8v0.o \
52 8mr.o 8r0.o 8r1.o 8r2.o 8r3.o 8r4.o 8r5.o 8sr.o 4sc.o 4u5.o \
53 @@ -692,7 +695,7 @@
54
55 hier.o: \
56 compile hier.c auto_home.h
57 - ./compile hier.c
58 + ./compile -DLIBDJBFFT=\"$(LIBDJBFFT)\" -DLIBPERMS=$(LIBPERMS) hier.c
59
60 install: \
61 load install.o hier.o auto_home.o strerr.a substdio.a open.a error.a \
62 @@ -731,7 +734,9 @@
63 ( cat warn-auto.sh; \
64 echo 'main="$$1"; shift'; \
65 echo 'rm -f "$$main"'; \
66 - echo 'ar cr "$$main" $${1+"$$@"}'; \
67 + echo 'if [ "$${main##*.}" = "a" ]'; \
68 + echo 'then'; \
69 + echo ' ar cr "$$main" $${1+"$$@"}'; \
70 case "`cat systype`" in \
71 sunos-5.*) ;; \
72 unix_sv*) ;; \
73 @@ -740,8 +745,11 @@
74 dgux-*) ;; \
75 hp-ux-*) ;; \
76 sco*) ;; \
77 - *) echo 'ranlib "$$main"' ;; \
78 - esac \
79 + *) echo ' ranlib "$$main"' ;; \
80 + esac; \
81 + echo 'else'; \
82 + echo ' exec `head -1 conf-ld` -shared -Wl,-soname,libdjbfft.so.0.7.6 -o "$$main" $${1+"$$@"}'; \
83 + echo 'fi'; \
84 ) > makelib
85 chmod 755 makelib
86
87 @@ -758,15 +766,15 @@
88 ./compile open_trunc.c
89
90 prog: \
91 -djbfft.a accuracy accuracy2 speed speed.out
92 +$(LIBDJBFFT) accuracy accuracy2 speed speed.out
93
94 setup: \
95 it install
96 ./install
97
98 speed: \
99 -load speed.o djbfft.a math.lib
100 - ./load speed djbfft.a `cat math.lib`
101 +load speed.o $(LIBDJBFFT) math.lib
102 + ./load speed $(LIBDJBFFT) `cat math.lib`
103
104 speed.o: \
105 compile speed.c fftr4.h real4.h fftr8.h real8.h fftc4.h complex4.h \
106 @@ -775,7 +783,7 @@
107
108 speed.out: \
109 speed
110 - ./speed > speed.out
111 + LD_LIBRARY_PATH=".:$$LD_LIBRARY_PATH" ./speed > speed.out
112
113 str.a: \
114 makelib byte_copy.o byte_cr.o str_len.o
115 --- djbfft-0.76/hier.c.orig 1999-09-30 22:25:58.000000000 +0200
116 +++ djbfft-0.76/hier.c 2004-01-17 16:39:21.312774411 +0100
117 @@ -2,12 +2,12 @@
118
119 void hier()
120 {
121 - h(auto_home,-1,-1,02755);
122 + h(auto_home,-1,-1,0755);
123
124 - d(auto_home,"lib",-1,-1,02755);
125 - c(auto_home,"lib","djbfft.a",-1,-1,0644);
126 + d(auto_home,"lib",-1,-1,0755);
127 + c(auto_home,"lib",LIBDJBFFT,-1,-1,LIBPERMS);
128
129 - d(auto_home,"include",-1,-1,02755);
130 + d(auto_home,"include",-1,-1,0755);
131 c(auto_home,"include","real4.h",-1,-1,0644);
132 c(auto_home,"include","real8.h",-1,-1,0644);
133 c(auto_home,"include","complex4.h",-1,-1,0644);

  ViewVC Help
Powered by ViewVC 1.1.20