1 |
bicatali 10/11/30 17:49:46 |
2 |
|
3 |
Added: grib_api-1.9.5-autotools.patch |
4 |
Log: |
5 |
Initial import |
6 |
|
7 |
(Portage version: 2.1.9.25/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 sci-libs/grib_api/files/grib_api-1.9.5-autotools.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/grib_api/files/grib_api-1.9.5-autotools.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/grib_api/files/grib_api-1.9.5-autotools.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: grib_api-1.9.5-autotools.patch |
16 |
=================================================================== |
17 |
diff -Nur grib_api-1.9.5.orig/configure.ac grib_api-1.9.5/configure.ac |
18 |
--- grib_api-1.9.5.orig/configure.ac 2010-11-24 21:25:48.000000000 +0000 |
19 |
+++ grib_api-1.9.5/configure.ac 2010-11-24 22:55:33.000000000 +0000 |
20 |
@@ -24,21 +24,9 @@ |
21 |
AC_CONFIG_HEADER([src/config.h]) |
22 |
AM_INIT_AUTOMAKE($PACKAGE_NAME,[${PACKAGE_VERSION}],[http://www.ecmwf.int]) |
23 |
|
24 |
-definition_files_path=/usr/local/share/grib_api/definitions |
25 |
-samples_files_path=/usr/local/share/grib_api/samples |
26 |
-default_perl_install='${prefix}/perl' |
27 |
- |
28 |
- |
29 |
-if test "$prefix" != 'NONE' ; then |
30 |
- definition_files_path=${prefix}/share/definitions |
31 |
- samples_files_path=${prefix}/share/samples |
32 |
- default_perl_install=${prefix}/perl |
33 |
-fi |
34 |
- |
35 |
-if test "$datadir" != '${datarootdir}' ; then |
36 |
- definition_files_path=$datadir/definitions |
37 |
-fi |
38 |
- |
39 |
+definition_files_path=${datadir}/$PACKAGE_NAME/definitions |
40 |
+samples_files_path=${datadir}/$PACKAGE_NAME/samples |
41 |
+default_perl_install=${prefix}/perl |
42 |
|
43 |
AC_DEFINE_UNQUOTED(GRIB_API_MAIN_VERSION,$GRIB_API_MAIN_VERSION,Grib Api version) |
44 |
AC_DEFINE_UNQUOTED(GRIB_API_MAJOR_VERSION,$GRIB_API_MAJOR_VERSION,Grib Api Major release) |
45 |
@@ -62,6 +50,7 @@ |
46 |
AC_PROG_LEX |
47 |
AC_PROG_F77(pgf90 pgf77 xlf gfortran f77 g77 f90 ifort) |
48 |
AC_PROG_FC(pgf90 xlf90 gfortran f90 ifort) |
49 |
+AC_PROG_LIBTOOL |
50 |
|
51 |
dnl check availability of pthreads |
52 |
AC_ARG_ENABLE([pthread], |
53 |
@@ -445,7 +434,7 @@ |
54 |
builddir=`pwd` |
55 |
|
56 |
dnl Options to pass when configuring Perl grib_api |
57 |
-GRIB_API_LIB="${builddir}/src/grib_api.a" |
58 |
+GRIB_API_LIB="${builddir}/src/libgrib_api.la" |
59 |
GRIB_API_INC="${builddir}/src" |
60 |
AC_ARG_WITH([perl-options], |
61 |
[AC_HELP_STRING([--with-perl-options=[OPTIONS]], [options to pass on command-line when |
62 |
diff -Nur grib_api-1.9.5.orig/definitions/installDefinitions.sh grib_api-1.9.5/definitions/installDefinitions.sh |
63 |
--- grib_api-1.9.5.orig/definitions/installDefinitions.sh 2010-11-24 21:25:47.000000000 +0000 |
64 |
+++ grib_api-1.9.5/definitions/installDefinitions.sh 2010-11-24 21:26:16.000000000 +0000 |
65 |
@@ -44,7 +44,7 @@ |
66 |
echo checking definition files compatibility... |
67 |
for file in `find . -name '*.def' -print` |
68 |
do |
69 |
- ${grib_api_bin}/parser $file |
70 |
+ ${grib_api_bin}/grib_parser $file |
71 |
done |
72 |
if [ $? != 0 ] |
73 |
then |
74 |
diff -Nur grib_api-1.9.5.orig/examples/C/Makefile.am grib_api-1.9.5/examples/C/Makefile.am |
75 |
--- grib_api-1.9.5.orig/examples/C/Makefile.am 2010-11-24 21:25:47.000000000 +0000 |
76 |
+++ grib_api-1.9.5/examples/C/Makefile.am 2010-11-24 21:26:16.000000000 +0000 |
77 |
@@ -30,7 +30,7 @@ |
78 |
|
79 |
INCLUDES = -I$(top_builddir)/src |
80 |
|
81 |
-LDADD = $(top_builddir)/src/libgrib_api.a |
82 |
+LDADD = $(top_builddir)/src/libgrib_api.la |
83 |
DEPENDENCIES = $(LDADD) |
84 |
|
85 |
EXTRA_DIST =$(TESTS) include.sh |
86 |
diff -Nur grib_api-1.9.5.orig/examples/F90/Makefile.am grib_api-1.9.5/examples/F90/Makefile.am |
87 |
--- grib_api-1.9.5.orig/examples/F90/Makefile.am 2010-11-24 21:25:47.000000000 +0000 |
88 |
+++ grib_api-1.9.5/examples/F90/Makefile.am 2010-11-24 21:26:16.000000000 +0000 |
89 |
@@ -37,7 +37,7 @@ |
90 |
|
91 |
AM_FCFLAGS = $(F90_MODULE_FLAG)$(top_builddir)/fortran |
92 |
|
93 |
-LDADD = $(top_builddir)/fortran/libgrib_api_f90.a $(top_builddir)/src/libgrib_api.a |
94 |
+LDADD = $(top_builddir)/fortran/libgrib_api_f90.la $(top_builddir)/src/libgrib_api.la |
95 |
DEPENDENCIES = $(LDADD) |
96 |
|
97 |
EXTRA_DIST =$(TESTS) include.sh |
98 |
diff -Nur grib_api-1.9.5.orig/examples/python/include.sh grib_api-1.9.5/examples/python/include.sh |
99 |
--- grib_api-1.9.5.orig/examples/python/include.sh 2010-11-24 21:25:47.000000000 +0000 |
100 |
+++ grib_api-1.9.5/examples/python/include.sh 2010-11-24 22:03:25.000000000 +0000 |
101 |
@@ -14,6 +14,8 @@ |
102 |
|
103 |
PYTHONPATH=$path/python:$PYTHONPATH |
104 |
export PYTHONPATH |
105 |
+LD_LIBRARY_PATH=$path/src/.libs:$LD_LIBRARY_PATH |
106 |
+export LD_LIBRARY_PATH |
107 |
|
108 |
set -u |
109 |
|
110 |
diff -Nur grib_api-1.9.5.orig/examples/python/Makefile.am grib_api-1.9.5/examples/python/Makefile.am |
111 |
--- grib_api-1.9.5.orig/examples/python/Makefile.am 2010-11-24 21:25:47.000000000 +0000 |
112 |
+++ grib_api-1.9.5/examples/python/Makefile.am 2010-11-24 21:51:35.000000000 +0000 |
113 |
@@ -10,7 +10,7 @@ |
114 |
iterator_SOURCES = iterator.c |
115 |
count_messages_SOURCES = count_messages.c |
116 |
INCLUDES = -I$(top_builddir)/src |
117 |
-LDADD = $(top_builddir)/src/libgrib_api.a |
118 |
+LDADD = $(top_builddir)/src/libgrib_api.la |
119 |
DEPENDENCIES = $(LDADD) |
120 |
|
121 |
EXTRA_DIST = $(TESTS) include.sh clone.py count_messages.py get.py index.py iterator.py keys_iterator.py multi_write.py nearest.py print_data.py samples.py set.py set_missing.py |
122 |
diff -Nur grib_api-1.9.5.orig/fortran/Makefile.am grib_api-1.9.5/fortran/Makefile.am |
123 |
--- grib_api-1.9.5.orig/fortran/Makefile.am 2010-11-24 21:25:47.000000000 +0000 |
124 |
+++ grib_api-1.9.5/fortran/Makefile.am 2010-11-24 21:26:16.000000000 +0000 |
125 |
@@ -2,14 +2,14 @@ |
126 |
|
127 |
AM_CFLAGS = @WARN_PEDANTIC@ |
128 |
|
129 |
-lib_LIBRARIES = libgrib_api_f77.a libgrib_api_f90.a |
130 |
+lib_LTLIBRARIES = libgrib_api_f77.la libgrib_api_f90.la |
131 |
include_HEADERS = grib_api_f77.h |
132 |
|
133 |
-libgrib_api_f77_a_SOURCES= grib_fortran.c grib_f77.c |
134 |
-libgrib_api_f77_a_DEPENDENCIES = $(top_builddir)/src/libgrib_api.a |
135 |
+libgrib_api_f77_la_SOURCES= grib_fortran.c grib_f77.c |
136 |
+libgrib_api_f77_la_DEPENDENCIES = $(top_builddir)/src/libgrib_api.la |
137 |
|
138 |
-libgrib_api_f90_a_SOURCES= grib_fortran.c grib_f90.f90 |
139 |
-libgrib_api_f90_a_DEPENDENCIES = $(top_builddir)/src/libgrib_api.a grib_api_externals.h grib_api_visibility.h grib_api_constants.h grib_kinds.h |
140 |
+libgrib_api_f90_la_SOURCES= grib_fortran.c grib_f90.f90 |
141 |
+libgrib_api_f90_la_DEPENDENCIES = $(top_builddir)/src/libgrib_api.la grib_api_externals.h grib_api_visibility.h grib_api_constants.h grib_kinds.h |
142 |
|
143 |
libgrib_api_fortran_prototypes= grib_fortran.c |
144 |
|
145 |
@@ -26,7 +26,7 @@ |
146 |
|
147 |
## Make sure these will be cleaned even when they're not built by |
148 |
## default. |
149 |
-CLEANFILES = libgrib_api_f77.a libgrib_api_f90.a grib_f90.f90 *.mod grib_types grib_kinds.h |
150 |
+CLEANFILES = libgrib_api_f77.la libgrib_api_f90.la grib_f90.f90 *.mod grib_types grib_kinds.h |
151 |
|
152 |
#noinst_HEADERS = |
153 |
|
154 |
diff -Nur grib_api-1.9.5.orig/ifs_samples/grib1/Makefile.am grib_api-1.9.5/ifs_samples/grib1/Makefile.am |
155 |
--- grib_api-1.9.5.orig/ifs_samples/grib1/Makefile.am 2010-11-24 21:25:48.000000000 +0000 |
156 |
+++ grib_api-1.9.5/ifs_samples/grib1/Makefile.am 2010-11-24 21:26:16.000000000 +0000 |
157 |
@@ -1,5 +1,5 @@ |
158 |
|
159 |
-ifs_samples_grib1dir = ifs_samples/grib1 |
160 |
+ifs_samples_grib1dir = @GRIB_SAMPLES_PATH@/ifs_samples/grib1 |
161 |
|
162 |
dist_ifs_samples_grib1_DATA = \ |
163 |
gg_ml.tmpl \ |
164 |
diff -Nur grib_api-1.9.5.orig/ifs_samples/grib1_mlgrib2/Makefile.am grib_api-1.9.5/ifs_samples/grib1_mlgrib2/Makefile.am |
165 |
--- grib_api-1.9.5.orig/ifs_samples/grib1_mlgrib2/Makefile.am 2010-11-24 21:25:48.000000000 +0000 |
166 |
+++ grib_api-1.9.5/ifs_samples/grib1_mlgrib2/Makefile.am 2010-11-24 21:26:16.000000000 +0000 |
167 |
@@ -1,5 +1,5 @@ |
168 |
|
169 |
-ifs_samples_grib1_mlgrib2dir = ifs_samples/grib1_mlgrib2 |
170 |
+ifs_samples_grib1_mlgrib2dir = @GRIB_SAMPLES_PATH@/ifs_samples/grib1_mlgrib2 |
171 |
|
172 |
dist_ifs_samples_grib1_mlgrib2_DATA = \ |
173 |
gg_ml.tmpl \ |
174 |
diff -Nur grib_api-1.9.5.orig/perl/GRIB-API/Makefile.PL.in grib_api-1.9.5/perl/GRIB-API/Makefile.PL.in |
175 |
--- grib_api-1.9.5.orig/perl/GRIB-API/Makefile.PL.in 2010-11-24 21:25:48.000000000 +0000 |
176 |
+++ grib_api-1.9.5/perl/GRIB-API/Makefile.PL.in 2010-11-24 22:56:11.000000000 +0000 |
177 |
@@ -19,5 +19,5 @@ |
178 |
INC => '-I@GRIB_API_INC@', # e.g., '-I. -I/usr/include/other' |
179 |
# Un-comment this if you add C files to link with later: |
180 |
# OBJECT => '$(O_FILES)', # link all the C files too |
181 |
- depend => { "API.o" => "../../src/libgrib_api.a" } |
182 |
+ depend => { "API.o" => "../../src/libgrib_api.la" } |
183 |
); |
184 |
diff -Nur grib_api-1.9.5.orig/perl/Makefile.am grib_api-1.9.5/perl/Makefile.am |
185 |
--- grib_api-1.9.5.orig/perl/Makefile.am 2010-11-24 21:25:48.000000000 +0000 |
186 |
+++ grib_api-1.9.5/perl/Makefile.am 2010-11-24 21:26:16.000000000 +0000 |
187 |
@@ -16,10 +16,10 @@ |
188 |
$(PERLMAKEFILE): $(PERLMAKEMAKER) |
189 |
cd $(API_DIR) && @PERL@ Makefile.PL @PERL_INSTALL_OPTIONS@ @PERL_MAKE_OPTIONS@ @PERL_LD_OPTIONS@ |
190 |
|
191 |
-$(PERLLIB): $(PERLMAKEFILE) $(top_builddir)/src/libgrib_api.a |
192 |
+$(PERLLIB): $(PERLMAKEFILE) $(top_builddir)/src/libgrib_api.la |
193 |
cd $(API_DIR) && $(MAKE) |
194 |
|
195 |
-$(top_builddir)/src/libgrib_api.a: $(top_builddir)/src/Makefile |
196 |
+$(top_builddir)/src/libgrib_api.la: $(top_builddir)/src/Makefile |
197 |
cd $(top_builddir)/src && $(MAKE) |
198 |
|
199 |
install-exec-perl: $(PERLMAKEFILE) |
200 |
diff -Nur grib_api-1.9.5.orig/python/setup.py.in grib_api-1.9.5/python/setup.py.in |
201 |
--- grib_api-1.9.5.orig/python/setup.py.in 2010-11-24 21:25:48.000000000 +0000 |
202 |
+++ grib_api-1.9.5/python/setup.py.in 2010-11-24 23:02:54.000000000 +0000 |
203 |
@@ -17,7 +17,8 @@ |
204 |
build_dir = '@BUILD_DIR@' |
205 |
add_attribute( |
206 |
include_dirs = os.path.join(build_dir,'src'), |
207 |
- extra_objects = os.path.join(build_dir,'src','libgrib_api.a') |
208 |
+ library_dirs = os.path.join(build_dir,'src','.libs'), |
209 |
+ libraries = 'grib_api' |
210 |
) |
211 |
|
212 |
with_jasper = '@LIB_JASPER@' |
213 |
diff -Nur grib_api-1.9.5.orig/src/extrules.am grib_api-1.9.5/src/extrules.am |
214 |
--- grib_api-1.9.5.orig/src/extrules.am 2010-11-24 21:25:48.000000000 +0000 |
215 |
+++ grib_api-1.9.5/src/extrules.am 2010-11-24 22:46:13.000000000 +0000 |
216 |
@@ -9,7 +9,7 @@ |
217 |
cmp ../python/grib_errors.h grib_errors.h.new || (p4 edit ../python/grib_errors.h ; cp grib_errors.h.new ../python/grib_errors.h) |
218 |
|
219 |
|
220 |
-proto:;-p4 edit grib_api_prototypes.h;mkptypes -A $(libgrib_api_a_prototypes) $(libgrib_api_extra_prototypes) > grib_api_prototypes.h |
221 |
+proto:;-p4 edit grib_api_prototypes.h;mkptypes -A $(libgrib_api_la_prototypes) $(libgrib_api_extra_prototypes) > grib_api_prototypes.h |
222 |
test:all;(cd ../tests; make tests) |
223 |
|
224 |
templates: |
225 |
diff -Nur grib_api-1.9.5.orig/src/Makefile.am grib_api-1.9.5/src/Makefile.am |
226 |
--- grib_api-1.9.5.orig/src/Makefile.am 2010-11-24 21:25:48.000000000 +0000 |
227 |
+++ grib_api-1.9.5/src/Makefile.am 2010-11-24 22:44:02.000000000 +0000 |
228 |
@@ -7,10 +7,10 @@ |
229 |
# -DYYDEBUG |
230 |
|
231 |
|
232 |
-lib_LIBRARIES = libgrib_api.a |
233 |
+lib_LTLIBRARIES = libgrib_api.la |
234 |
include_HEADERS = grib_api.h |
235 |
|
236 |
-libgrib_api_a_prototypes= \ |
237 |
+libgrib_api_la_prototypes= \ |
238 |
action.c \ |
239 |
action_class_alias.c \ |
240 |
action_class_gen.c \ |
241 |
@@ -139,7 +139,6 @@ |
242 |
grib_accessor_class_spectral_truncation.c \ |
243 |
grib_accessor_class_time.c \ |
244 |
grib_accessor_class_transient.c \ |
245 |
- grib_accessor_class_g1_half_byte_codeflag.c \ |
246 |
grib_accessor_class_values.c \ |
247 |
grib_accessor_class_simple_packing_error.c \ |
248 |
grib_accessor_class_data_simple_packing.c \ |
249 |
@@ -270,10 +269,10 @@ |
250 |
|
251 |
libgrib_api_extra_prototypes = grib_bits_any_endian.c grib_bits_any_endian_simple.c |
252 |
|
253 |
-libgrib_api_a_SOURCES = $(libgrib_api_a_prototypes) grib_yacc.c grib_lex.c |
254 |
+libgrib_api_la_SOURCES = $(libgrib_api_la_prototypes) grib_yacc.c grib_lex.c |
255 |
|
256 |
-libgrib_api_a_LIBADD = @LIBOBJS@ |
257 |
-libgrib_api_a_DEPENDENCIES = grib_api.h $(libgrib_api_a_LIBADD) |
258 |
+libgrib_api_la_LIBADD = @LIBOBJS@ |
259 |
+libgrib_api_la_DEPENDENCIES = grib_api.h $(libgrib_api_la_LIBADD) |
260 |
|
261 |
|
262 |
# set the include path |
263 |
@@ -281,7 +280,7 @@ |
264 |
|
265 |
## Make sure these will be cleaned even when they're not built by |
266 |
## default. |
267 |
-CLEANFILES = libgrib_api.a |
268 |
+CLEANFILES = libgrib_api.la |
269 |
|
270 |
|
271 |
noinst_HEADERS = grib_api_internal.h \ |
272 |
diff -Nur grib_api-1.9.5.orig/tests/definitions.sh grib_api-1.9.5/tests/definitions.sh |
273 |
--- grib_api-1.9.5.orig/tests/definitions.sh 2010-11-24 21:25:48.000000000 +0000 |
274 |
+++ grib_api-1.9.5/tests/definitions.sh 2010-11-24 21:30:11.000000000 +0000 |
275 |
@@ -15,6 +15,6 @@ |
276 |
|
277 |
for file in `find $GRIB_DEFINITION_PATH -name '*.def' -print` |
278 |
do |
279 |
- ${tools_dir}parser $file > $REDIRECT |
280 |
+ ${tools_dir}grib_parser $file > $REDIRECT |
281 |
done |
282 |
|
283 |
diff -Nur grib_api-1.9.5.orig/tests/Makefile.am grib_api-1.9.5/tests/Makefile.am |
284 |
--- grib_api-1.9.5.orig/tests/Makefile.am 2010-11-24 21:25:48.000000000 +0000 |
285 |
+++ grib_api-1.9.5/tests/Makefile.am 2010-11-24 21:26:16.000000000 +0000 |
286 |
@@ -31,7 +31,7 @@ |
287 |
gribex_perf_SOURCES = gribex_perf.c |
288 |
gribex_perf_SOURCES = gauss_sub.c |
289 |
|
290 |
- LDADD = $(top_builddir)/src/libgrib_api.a $(EMOS_LIB) |
291 |
+ LDADD = $(top_builddir)/src/libgrib_api.la $(EMOS_LIB) |
292 |
|
293 |
INCLUDES = -I$(top_builddir)/src |
294 |
|
295 |
diff -Nur grib_api-1.9.5.orig/tigge/Makefile.am grib_api-1.9.5/tigge/Makefile.am |
296 |
--- grib_api-1.9.5.orig/tigge/Makefile.am 2010-11-24 21:25:47.000000000 +0000 |
297 |
+++ grib_api-1.9.5/tigge/Makefile.am 2010-11-24 21:26:16.000000000 +0000 |
298 |
@@ -12,5 +12,5 @@ |
299 |
|
300 |
INCLUDES = -I$(top_builddir)/src |
301 |
|
302 |
-LDADD = $(top_builddir)/src/libgrib_api.a |
303 |
+LDADD = $(top_builddir)/src/libgrib_api.la |
304 |
DEPENDENCIES = $(LDADD) |
305 |
diff -Nur grib_api-1.9.5.orig/tools/Makefile.am grib_api-1.9.5/tools/Makefile.am |
306 |
--- grib_api-1.9.5.orig/tools/Makefile.am 2010-11-24 21:25:48.000000000 +0000 |
307 |
+++ grib_api-1.9.5/tools/Makefile.am 2010-11-24 21:26:16.000000000 +0000 |
308 |
@@ -3,9 +3,9 @@ |
309 |
|
310 |
AM_YFLAGS = -d |
311 |
|
312 |
-noinst_LIBRARIES = libgrib_tools.a |
313 |
+noinst_LTLIBRARIES = libgrib_tools.la |
314 |
|
315 |
-libgrib_tools_a_SOURCES = grib_tools.c \ |
316 |
+libgrib_tools_la_SOURCES = grib_tools.c \ |
317 |
grib_options.c |
318 |
|
319 |
|
320 |
@@ -13,7 +13,7 @@ |
321 |
grib_debug grib_info grib_filter grib_ls grib_dump \ |
322 |
grib2ppm grib_set grib_get grib_get_data grib_copy grib_repair \ |
323 |
grib_packing grib_cmp grib_convert grib_distance grib_corruption_check\ |
324 |
- grib_compare grib_list_keys parser grib_count grib_index_build grib1to2 \ |
325 |
+ grib_compare grib_list_keys grib_parser grib_count grib_index_build grib1to2 \ |
326 |
gg_sub_area_check |
327 |
|
328 |
noinst_PROGRAMS = gaussian grib_diff mars_request xref all_keys #compile dumpload grib_compare_old |
329 |
@@ -30,7 +30,7 @@ |
330 |
grib_histogram_SOURCES = grib_histogram.c |
331 |
grib_distance_SOURCES = grib_distance.c |
332 |
grib_debug_SOURCES = grib_debug.c |
333 |
-parser_SOURCES = parser.c |
334 |
+grib_parser_SOURCES = parser.c |
335 |
grib_list_keys_SOURCES = list_keys.c |
336 |
all_keys_SOURCES = all_keys.c |
337 |
grib2ppm_SOURCES = grib2ppm.c |
338 |
@@ -60,12 +60,12 @@ |
339 |
|
340 |
INCLUDES = -I$(top_builddir)/src |
341 |
|
342 |
-LDADD = libgrib_tools.a $(top_builddir)/src/libgrib_api.a |
343 |
+LDADD = libgrib_tools.la $(top_builddir)/src/libgrib_api.la |
344 |
DEPENDENCIES = $(LDADD) |
345 |
|
346 |
## Make sure these will be cleaned even when they're not built by |
347 |
## default. |
348 |
-CLEANFILES = libgrib_tools.a |
349 |
+CLEANFILES = libgrib_tools.la |
350 |
|
351 |
grib1to2$(EXEEXT): grib1to2.txt |
352 |
sed "s:toolsdir:$(bindir):" grib1to2.txt > grib1to2 |