Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-shells/bash/files: bash-4.0-ldflags-for-build.patch bash-4.0-protos.patch
Date: Sat, 21 Feb 2009 23:03:50
Message-Id: E1Lb0su-0003nn-3a@stork.gentoo.org
1 vapier 09/02/21 23:03:48
2
3 Added: bash-4.0-ldflags-for-build.patch
4 bash-4.0-protos.patch
5 Log:
6 Version bump #254994 by Peter Alfredsen.
7 (Portage version: 2.2_rc23/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 app-shells/bash/files/bash-4.0-ldflags-for-build.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/files/bash-4.0-ldflags-for-build.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/files/bash-4.0-ldflags-for-build.patch?rev=1.1&content-type=text/plain
14
15 Index: bash-4.0-ldflags-for-build.patch
16 ===================================================================
17 http://bugs.gentoo.org/211947
18
19 fix from Takashi YOSHII: dont use target ldflags for build apps
20
21 --- bash/Makefile.in
22 +++ bash/Makefile.in
23 @@ -143,7 +143,7 @@
24 CCFLAGS_FOR_BUILD = $(BASE_CCFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
25
26 LDFLAGS = @LDFLAGS@ $(STATIC_LD) $(LOCAL_LDFLAGS) $(PROFILE_FLAGS) $(CFLAGS)
27 -LDFLAGS_FOR_BUILD = $(LDFLAGS)
28 +LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ $(LOCAL_LDFLAGS) $(CFLAGS_FOR_BUILD)
29
30 INCLUDES = -I. @RL_INCLUDE@ -I$(srcdir) -I$(BASHINCDIR) -I$(LIBSRC) $(INTL_INC)
31
32
33
34
35 1.1 app-shells/bash/files/bash-4.0-protos.patch
36
37 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/files/bash-4.0-protos.patch?rev=1.1&view=markup
38 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/files/bash-4.0-protos.patch?rev=1.1&content-type=text/plain
39
40 Index: bash-4.0-protos.patch
41 ===================================================================
42 move prototypes around so they show up when needed
43
44 --- a/lib/glob/strmatch.c
45 +++ b/lib/glob/strmatch.c
46 @@ -25,9 +25,6 @@
47 #include "strmatch.h"
48
49 extern int xstrmatch __P((char *, char *, int));
50 -#if defined (HANDLE_MULTIBYTE)
51 -extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int));
52 -#endif
53
54 int
55 strmatch (pattern, string, flags)
56 --- a/lib/glob/strmatch.h
57 +++ b/lib/glob/strmatch.h
58 @@ -57,6 +57,7 @@
59
60 #if HANDLE_MULTIBYTE
61 extern int wcsmatch __P((wchar_t *, wchar_t *, int));
62 +extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int));
63 #endif
64
65 #endif /* _STRMATCH_H */
66 --- a/quit.h
67 +++ b/quit.h
68 @@ -21,6 +21,8 @@
69 #if !defined (_QUIT_H_)
70 #define _QUIT_H_
71
72 +#include "sig.h"
73 +
74 /* Non-zero means SIGINT has already ocurred. */
75 extern volatile int interrupt_state;
76 extern volatile int terminating_signal;