1 |
ssuominen 11/02/02 17:54:35 |
2 |
|
3 |
Added: bas-2.1-configure.patch bas-2.1-makefile.patch |
4 |
Log: |
5 |
Initial commit wrt #353356 by Kevin McCarthy. |
6 |
|
7 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-lang/bas/files/bas-2.1-configure.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/bas/files/bas-2.1-configure.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/bas/files/bas-2.1-configure.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: bas-2.1-configure.patch |
16 |
=================================================================== |
17 |
Remove hardcoded CFLAG -pipe |
18 |
Remove hardcoded LDFLAG -g |
19 |
|
20 |
Disable check for lrint to fix compile warning. |
21 |
|
22 |
Patch by Kevin McCarthy <signals42@×××××.com> |
23 |
|
24 |
--- configure.in |
25 |
+++ configure.in |
26 |
@@ -31,8 +31,8 @@ |
27 |
AC_PROG_CC |
28 |
if test "$GCC" = yes |
29 |
then |
30 |
- CFLAGS="${CFLAGS} ${EXTRA_GCFLAGS}-pipe -Wall -Wno-unused -Wshadow -Wbad-function-cast -Wmissing-prototypes -Wstrict-prototypes -Wcast-align -Wcast-qual -Wpointer-arith -Wwrite-strings -Wmissing-declarations -Wnested-externs -Wundef -pedantic -fno-common" |
31 |
- LDFLAGS="${LDFLAGS} ${EXTRA_GLDFLAGS}-g" |
32 |
+ CFLAGS="${CFLAGS} ${EXTRA_GCFLAGS} -Wall -Wno-unused -Wshadow -Wbad-function-cast -Wmissing-prototypes -Wstrict-prototypes -Wcast-align -Wcast-qual -Wpointer-arith -Wwrite-strings -Wmissing-declarations -Wnested-externs -Wundef -pedantic -fno-common" |
33 |
+ LDFLAGS="${LDFLAGS} ${EXTRA_GLDFLAGS}" |
34 |
else |
35 |
CFLAGS="${CFLAGS} ${EXTRA_CFLAGS}" |
36 |
LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}" |
37 |
@@ -65,7 +65,6 @@ |
38 |
exit 1 |
39 |
fi |
40 |
|
41 |
-AC_CHECK_FUNCS(lrint) |
42 |
AC_CHECK_FUNCS(nanosleep) |
43 |
|
44 |
AC_CHECK_FUNCS(tgetent,have_tgetent=yes) |
45 |
|
46 |
|
47 |
|
48 |
1.1 dev-lang/bas/files/bas-2.1-makefile.patch |
49 |
|
50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/bas/files/bas-2.1-makefile.patch?rev=1.1&view=markup |
51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/bas/files/bas-2.1-makefile.patch?rev=1.1&content-type=text/plain |
52 |
|
53 |
Index: bas-2.1-makefile.patch |
54 |
=================================================================== |
55 |
Fixes makefile.in to respect DESTDIR during install |
56 |
Fixes makefile.in to use $MAKE instead of 'make' |
57 |
Fixes makefile.in to respect AR during libbas build |
58 |
|
59 |
Patch by Kevin McCarthy <signals42@×××××.com> |
60 |
|
61 |
--- Makefile.in |
62 |
+++ Makefile.in |
63 |
@@ -27,7 +27,7 @@ |
64 |
libbas.a: auto.o bas.o fs.o global.o token.o program.o \ |
65 |
str.o value.o var.o |
66 |
rm -f $@ |
67 |
- ar cq $@ auto.o bas.o fs.o global.o token.o program.o \ |
68 |
+ $(AR) cq $@ auto.o bas.o fs.o global.o token.o program.o \ |
69 |
str.o value.o var.o |
70 |
@RANLIB@ libbas.a |
71 |
|
72 |
@@ -35,7 +35,7 @@ |
73 |
install-po-no: |
74 |
install-po-yes: $(CATALOGS) |
75 |
for cat in $(CATALOGS); do \ |
76 |
- dir=$(localedir)/`basename $$cat .mo`/LC_MESSAGES; \ |
77 |
+ dir=$(DESTDIR)/$(localedir)/`basename $$cat .mo`/LC_MESSAGES; \ |
78 |
[ -d $$dir ] || @INSTALL@ -m 755 -d $$dir; \ |
79 |
@INSTALL@ -m 644 $$cat $$dir/bas.mo; \ |
80 |
done |
81 |
@@ -44,14 +44,14 @@ |
82 |
for i in test/test*; do ./$$i || break; done |
83 |
|
84 |
install: all |
85 |
- @INSTALL@ -m 755 -d @bindir@ |
86 |
- @INSTALL@ bas @bindir@/bas |
87 |
- @INSTALL@ -m 755 -d @libdir@ |
88 |
- @INSTALL@ -m 644 libbas.a @libdir@/libbas.a |
89 |
- @RANLIB@ @libdir@/libbas.a |
90 |
- @INSTALL@ -m 755 -d @mandir@/man1 |
91 |
- @INSTALL@ -m 644 bas.1 @mandir@/man1/bas.1 |
92 |
- make install-po |
93 |
+ @INSTALL@ -m 755 -d $(DESTDIR)/@bindir@ |
94 |
+ @INSTALL@ bas $(DESTDIR)/@bindir@/bas |
95 |
+ @INSTALL@ -m 755 -d $(DESTDIR)/@libdir@ |
96 |
+ @INSTALL@ -m 644 libbas.a $(DESTDIR)/@libdir@/libbas.a |
97 |
+ @RANLIB@ $(DESTDIR)/@libdir@/libbas.a |
98 |
+ @INSTALL@ -m 755 -d $(DESTDIR)/@mandir@/man1 |
99 |
+ @INSTALL@ -m 644 bas.1 $(DESTDIR)/@mandir@/man1/bas.1 |
100 |
+ $(MAKE) install-po |
101 |
|
102 |
.c.o: |
103 |
$(CC) -c $(CPPFLAGS) $(CFLAGS) $< |