1 |
ssuominen 09/08/06 10:34:42 |
2 |
|
3 |
Added: mdsplib-0.11-gentoo.patch |
4 |
Log: |
5 |
Fix building with GLIBC 2.10+ wrt #278240. |
6 |
(Portage version: 2.2_rc36/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 dev-libs/mdsplib/files/mdsplib-0.11-gentoo.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/mdsplib/files/mdsplib-0.11-gentoo.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/mdsplib/files/mdsplib-0.11-gentoo.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: mdsplib-0.11-gentoo.patch |
15 |
=================================================================== |
16 |
diff -ur mdsplib-0.11.orig/Makefile mdsplib-0.11/Makefile |
17 |
--- mdsplib-0.11.orig/Makefile 2003-12-10 21:56:23.000000000 +0200 |
18 |
+++ mdsplib-0.11/Makefile 2009-08-06 13:33:03.000000000 +0300 |
19 |
@@ -1,5 +1,6 @@ |
20 |
-CC = gcc |
21 |
-CFLAGS = -O3 |
22 |
+AR ?= ar |
23 |
+CC ?= gcc |
24 |
+RANLIB ?= ranlib |
25 |
LIBS = |
26 |
|
27 |
library: libmetar.a |
28 |
@@ -7,11 +8,11 @@ |
29 |
all: dmetar library |
30 |
|
31 |
libmetar.a: src/antoi.o src/charcmp.o src/dcdmetar.o src/dcdmtrmk.o src/fracpart.o src/prtdmetr.o src/stspack2.o src/stspack3.o |
32 |
- ar ruv libmetar.a src/antoi.o src/charcmp.o src/dcdmetar.o src/dcdmtrmk.o src/fracpart.o src/prtdmetr.o src/stspack2.o src/stspack3.o |
33 |
- ranlib libmetar.a |
34 |
+ $(AR) ruv libmetar.a src/antoi.o src/charcmp.o src/dcdmetar.o src/dcdmtrmk.o src/fracpart.o src/prtdmetr.o src/stspack2.o src/stspack3.o |
35 |
+ $(RANLIB) libmetar.a |
36 |
|
37 |
dmetar: src/drvmetar.o libmetar.a |
38 |
- $(CC) $(CFLAGS) -o dmetar src/drvmetar.o libmetar.a $(LIBS) |
39 |
+ $(CC) $(LDFLAGS) $(CFLAGS) -o dmetar src/drvmetar.o libmetar.a $(LIBS) |
40 |
|
41 |
src/antoi.o: src/antoi.c src/local.h |
42 |
$(CC) $(CFLAGS) -c src/antoi.c -o src/antoi.o |
43 |
@@ -48,5 +49,5 @@ |
44 |
chmod 0644 /usr/local/include/metar.h |
45 |
cp libmetar.a /usr/local/lib/ |
46 |
chmod 0644 /usr/local/lib/libmetar.a |
47 |
- ranlib /usr/local/lib/libmetar.a |
48 |
+ $(RANLIB) /usr/local/lib/libmetar.a |
49 |
|
50 |
diff -ur mdsplib-0.11.orig/src/local.h mdsplib-0.11/src/local.h |
51 |
--- mdsplib-0.11.orig/src/local.h 2003-12-10 23:30:56.000000000 +0200 |
52 |
+++ mdsplib-0.11/src/local.h 2009-08-06 13:27:03.000000000 +0300 |
53 |
@@ -1175,7 +1175,7 @@ |
54 |
char *strupr(char *); |
55 |
char *strlwr(char *); |
56 |
/* char *strdup(char *); */ |
57 |
-char *strndup(char *, int); |
58 |
+/* char *strndup(char *, int); */ |
59 |
int strcmpi(char *, char *); |
60 |
|
61 |
/* void *memccpy(void *, void *, int, unsigned); */ |