1 |
abcd 10/04/06 06:21:42 |
2 |
|
3 |
Added: fish-1.22.3-gettext.patch |
4 |
fish-1.23.0-gentoo-alt.patch |
5 |
Log: |
6 |
Bump to EAPI=3, add prefix keywords, patches |
7 |
(Portage version: -svn/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 app-shells/fish/files/fish-1.22.3-gettext.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/fish/files/fish-1.22.3-gettext.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/fish/files/fish-1.22.3-gettext.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: fish-1.22.3-gettext.patch |
16 |
=================================================================== |
17 |
--- configure.ac.orig 2007-10-02 20:43:22.949337380 +0200 |
18 |
+++ configure.ac 2007-10-02 20:43:28.819055940 +0200 |
19 |
@@ -210,6 +210,8 @@ |
20 |
) |
21 |
|
22 |
if test x$local_gettext != xno; then |
23 |
+ AM_GNU_GETTEXT |
24 |
+ LIBS="$LIBS $LIBINTL" |
25 |
AC_DEFINE([USE_GETTEXT],[1],[Perform string translations with gettext]) |
26 |
fi |
27 |
|
28 |
|
29 |
|
30 |
|
31 |
1.1 app-shells/fish/files/fish-1.23.0-gentoo-alt.patch |
32 |
|
33 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/fish/files/fish-1.23.0-gentoo-alt.patch?rev=1.1&view=markup |
34 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/fish/files/fish-1.23.0-gentoo-alt.patch?rev=1.1&content-type=text/plain |
35 |
|
36 |
Index: fish-1.23.0-gentoo-alt.patch |
37 |
=================================================================== |
38 |
* Remove Darwin cruft, remove some Solaris misdetection crap, add |
39 |
AM_ICONV instead of weird iconv check that not suprisingly fails on |
40 |
Darwin. |
41 |
|
42 |
--- configure.ac |
43 |
+++ configure.ac |
44 |
@@ -91,45 +91,6 @@ |
45 |
|
46 |
|
47 |
# |
48 |
-# Detect directories which may contain additional headers, libraries |
49 |
-# and commands. This needs to be done early - before Autoconf starts |
50 |
-# to mess with CFLAGS and all the other environemnt variables. |
51 |
-# |
52 |
-# This mostly helps OS X users, since fink usually installs out of |
53 |
-# tree and doesn't update CFLAGS. |
54 |
-# |
55 |
- |
56 |
-for i in /usr/pkg /sw /opt /opt/local; do |
57 |
- |
58 |
- AC_MSG_CHECKING([for $i/include include directory]) |
59 |
- if test -d $i/include; then |
60 |
- AC_MSG_RESULT(yes) |
61 |
- CPPFLAGS="$CPPFLAGS -I$i/include/" |
62 |
- CFLAGS="$CFLAGS -I$i/include/" |
63 |
- else |
64 |
- AC_MSG_RESULT(no) |
65 |
- fi |
66 |
- |
67 |
- AC_MSG_CHECKING([for $i/lib library directory]) |
68 |
- if test -d $i/lib; then |
69 |
- AC_MSG_RESULT(yes) |
70 |
- LDFLAGS="$LDFLAGS -L$i/lib/ -R$i/lib/" |
71 |
- else |
72 |
- AC_MSG_RESULT(no) |
73 |
- fi |
74 |
- |
75 |
- AC_MSG_CHECKING([for $i/bin command directory]) |
76 |
- if test -d $i/bin; then |
77 |
- AC_MSG_RESULT(yes) |
78 |
- optbindirs="$optbindirs $i/bin" |
79 |
- else |
80 |
- AC_MSG_RESULT(no) |
81 |
- fi |
82 |
- |
83 |
-done |
84 |
- |
85 |
- |
86 |
-# |
87 |
# Tell autoconf to create config.h header |
88 |
# |
89 |
AC_CONFIG_HEADERS(config.h) |
90 |
@@ -153,10 +114,7 @@ |
91 |
# Set up various programs needed for install |
92 |
# |
93 |
|
94 |
-# Here we look for c99 before cc as Sun Studio compiler supports c99 |
95 |
-# through the c99 binary. |
96 |
- |
97 |
-AC_PROG_CC([gcc c99 cc]) |
98 |
+AC_PROG_CC |
99 |
AC_PROG_CPP |
100 |
AC_PROG_INSTALL |
101 |
|
102 |
@@ -520,9 +445,8 @@ |
103 |
AC_SEARCH_LIBS( gettext, intl,,) |
104 |
fi |
105 |
|
106 |
- |
107 |
-AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] ) |
108 |
-LIBS_FISH=$LIBS |
109 |
-LIBS=$LIBS_COMMON |
110 |
+AM_ICONV |
111 |
+LIBS_FISH="$LIBS $LIBICONV" |
112 |
+LIBS="$LIBS_COMMON $LIBICONV" |
113 |
|
114 |
# |
115 |
# Check for libraries needed by fish_indent. |