1 |
bicatali 11/11/20 20:34:46 |
2 |
|
3 |
Added: grib_api-1.9.9-ieeefloat.patch |
4 |
grib_api-1.9.9-autotools.patch |
5 |
Log: |
6 |
Version bump. Still patch the normal version since the autotools does not have the perl bindings. Fix bug #378167, thanks tove. |
7 |
|
8 |
(Portage version: 2.1.10.36/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 sci-libs/grib_api/files/grib_api-1.9.9-ieeefloat.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/grib_api/files/grib_api-1.9.9-ieeefloat.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/grib_api/files/grib_api-1.9.9-ieeefloat.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: grib_api-1.9.9-ieeefloat.patch |
17 |
=================================================================== |
18 |
--- grib_api-1.9.9.orig/src/grib_ieeefloat.c 2009-11-24 11:51:55.000000000 +0000 |
19 |
+++ grib_api-1.9.9/src/grib_ieeefloat.c 2011-03-08 17:36:39.000000000 +0000 |
20 |
@@ -336,12 +336,13 @@ |
21 |
#if IEEE_LE |
22 |
unsigned char s[8]={0,}; |
23 |
unsigned char* buf=(unsigned char*)&x; |
24 |
+ size_t nb = sizeof(unsigned long); |
25 |
int j=0; |
26 |
for (j=7;j>=0;j--) |
27 |
s[j]= *(buf++); |
28 |
- memcpy(&lval,s,8); |
29 |
+ memcpy(&lval,s,nb); |
30 |
#elif IEEE_BE |
31 |
- memcpy(&lval,&x,8); |
32 |
+ memcpy(&lval,&x,nb); |
33 |
#endif |
34 |
return lval; |
35 |
} |
36 |
|
37 |
|
38 |
|
39 |
1.1 sci-libs/grib_api/files/grib_api-1.9.9-autotools.patch |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/grib_api/files/grib_api-1.9.9-autotools.patch?rev=1.1&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/grib_api/files/grib_api-1.9.9-autotools.patch?rev=1.1&content-type=text/plain |
43 |
|
44 |
Index: grib_api-1.9.9-autotools.patch |
45 |
=================================================================== |
46 |
diff -Nur grib_api-1.9.9.orig/configure.ac grib_api-1.9.9/configure.ac |
47 |
--- grib_api-1.9.9.orig/configure.ac 2010-10-19 13:19:26.000000000 +0100 |
48 |
+++ grib_api-1.9.9/configure.ac 2011-03-08 17:20:10.000000000 +0000 |
49 |
@@ -24,21 +24,9 @@ |
50 |
AC_CONFIG_HEADER([src/config.h]) |
51 |
AM_INIT_AUTOMAKE($PACKAGE_NAME,[${PACKAGE_VERSION}],[http://www.ecmwf.int]) |
52 |
|
53 |
-definition_files_path=/usr/local/share/grib_api/definitions |
54 |
-samples_files_path=/usr/local/share/grib_api/samples |
55 |
-default_perl_install='${prefix}/perl' |
56 |
- |
57 |
- |
58 |
-if test "$prefix" != 'NONE' ; then |
59 |
- definition_files_path=${prefix}/share/definitions |
60 |
- samples_files_path=${prefix}/share/samples |
61 |
- default_perl_install=${prefix}/perl |
62 |
-fi |
63 |
- |
64 |
-if test "$datadir" != '${datarootdir}' ; then |
65 |
- definition_files_path=$datadir/definitions |
66 |
-fi |
67 |
- |
68 |
+definition_files_path=${datadir}/$PACKAGE_NAME/definitions |
69 |
+samples_files_path=${datadir}/$PACKAGE_NAME/samples |
70 |
+default_perl_install=${prefix}/perl |
71 |
|
72 |
AC_DEFINE_UNQUOTED(GRIB_API_MAIN_VERSION,$GRIB_API_MAIN_VERSION,Grib Api version) |
73 |
AC_DEFINE_UNQUOTED(GRIB_API_MAJOR_VERSION,$GRIB_API_MAJOR_VERSION,Grib Api Major release) |
74 |
@@ -62,19 +50,20 @@ |
75 |
AC_PROG_LEX |
76 |
AC_PROG_F77(pgf90 pgf77 xlf gfortran f77 g77 f90 ifort) |
77 |
AC_PROG_FC(pgf90 xlf90 gfortran f90 ifort) |
78 |
+AC_PROG_LIBTOOL |
79 |
|
80 |
dnl check availability of pthreads |
81 |
AC_ARG_ENABLE([pthread], |
82 |
[AC_HELP_STRING([--enable-pthread], |
83 |
- [enable POSIX thread ])], |
84 |
- GRIB_PTHREADS=1 , GRIB_PTHREADS=0 |
85 |
-) |
86 |
+ [enable POSIX thread ])]) |
87 |
|
88 |
-if test $GRIB_PTHREADS -eq 1 |
89 |
+if test x"$enable_pthread" = x"yes" |
90 |
then |
91 |
+GRIB_PTHREADS=1 |
92 |
AC_GRIB_PTHREADS |
93 |
AC_GRIB_LINUX_PTHREADS |
94 |
else |
95 |
+GRIB_PTHREADS=0 |
96 |
GRIB_LINUX_PTHREADS=0 |
97 |
fi |
98 |
|
99 |
@@ -97,9 +86,9 @@ |
100 |
AC_ARG_ENABLE([ieee-native], |
101 |
[AC_HELP_STRING([--disable-ieee-native], |
102 |
[disable ieee native packing])], |
103 |
- without_ieee=1,without_ieee=0) |
104 |
+ with_ieee=$enableval,with_ieee=no) |
105 |
|
106 |
-if test $without_ieee -eq 1 |
107 |
+if test x"$with_ieee" = x"yes" |
108 |
then |
109 |
AC_DEFINE_UNQUOTED(IEEE_LE,0,1-> ieee little endian float/double 0->no ieee little endian float/double) |
110 |
AC_DEFINE_UNQUOTED(IEEE_BE,0,1-> ieee big endian float/double 0->no ieee big endian float/double) |
111 |
@@ -120,36 +109,47 @@ |
112 |
AC_ARG_ENABLE([align-memory], |
113 |
[AC_HELP_STRING([--enable-align-memory], |
114 |
[enable memory alignement])], |
115 |
-AC_DEFINE_UNQUOTED(GRIB_MEM_ALIGN,1,memory alignment required) , |
116 |
- ) |
117 |
+with_mem_align=$enableval) |
118 |
|
119 |
+if test x"$with_mem_align" = x"yes" |
120 |
+then |
121 |
+AC_DEFINE_UNQUOTED(GRIB_MEM_ALIGN,1,memory alignment required) |
122 |
+fi |
123 |
dnl use vectorised code |
124 |
AC_ARG_ENABLE([vector], |
125 |
[AC_HELP_STRING([--enable-vector], |
126 |
[enable vectorised code ])], |
127 |
- vectorise=1,vectorise=0) |
128 |
- |
129 |
+ with_vectorise=$enableval, vectorise=0) |
130 |
+if test x"$with_vectorise" = x"yes" |
131 |
+then |
132 |
+vectorise=1 |
133 |
+fi |
134 |
AC_DEFINE_UNQUOTED(VECTOR,$vectorise,vectorised code) |
135 |
|
136 |
dnl enable memory management |
137 |
AC_ARG_ENABLE([memory-management], |
138 |
[AC_HELP_STRING([--enable-memory-management], |
139 |
[enable memory ])], |
140 |
-AC_DEFINE_UNQUOTED(MANAGE_MEM,1,memory management) , |
141 |
+with_manage_mem=$enableval, |
142 |
AC_DEFINE_UNQUOTED(MANAGE_MEM,0,memory management) |
143 |
) |
144 |
+if test x"$with_manage_mem" = x"yes" |
145 |
+then |
146 |
+AC_DEFINE_UNQUOTED(MANAGE_MEM,1,memory management) |
147 |
+fi |
148 |
|
149 |
dnl enable development configuration |
150 |
DEVEL_RULES='' |
151 |
AC_ARG_ENABLE([development], |
152 |
[AC_HELP_STRING([--enable-development], |
153 |
- [enable development configuration ])], |
154 |
- GRIB_DEVEL=1 , GRIB_DEVEL=0 |
155 |
-) |
156 |
-if test $GRIB_DEVEL -eq 1 |
157 |
+ [enable development configuration ])]) |
158 |
+ |
159 |
+if test x"$enable_development" = x"yes" |
160 |
then |
161 |
+ GRIB_DEVEL=1 |
162 |
DEVEL_RULES='extrules.am' |
163 |
else |
164 |
+ GRIB_DEVEL=0 |
165 |
DEVEL_RULES='dummy.am' |
166 |
fi |
167 |
AC_SUBST(DEVEL_RULES) |
168 |
@@ -186,14 +186,14 @@ |
169 |
AC_ARG_ENABLE([fortran], |
170 |
[AC_HELP_STRING([--disable-fortran], |
171 |
[disable fortran interface])], |
172 |
- without_fortran=1,without_fortran=0) |
173 |
+ with_fortran=$enableval,with_fortran=yes) |
174 |
|
175 |
if test "x$FC" = "x" |
176 |
then |
177 |
- without_fortran=1 |
178 |
+ with_fortran=no |
179 |
fi |
180 |
|
181 |
-if test $without_fortran -ne 1 |
182 |
+if test x$"with_fortran" = x"yes" |
183 |
then |
184 |
FORTRAN_MOD=fortran |
185 |
AC_SUBST(FORTRAN_MOD) |
186 |
@@ -262,8 +262,8 @@ |
187 |
AC_ARG_ENABLE([timer], |
188 |
[AC_HELP_STRING([--enable-timer], |
189 |
[enable timer])], |
190 |
- with_timer=1,with_timer=0) |
191 |
-if test ${with_timer} -eq 1 |
192 |
+ with_timer=$enable_val,with_timer=no) |
193 |
+if test x"${with_timer}" = x"yes" |
194 |
then |
195 |
AC_DEFINE(GRIB_TIMER,1,1->Timer on 0->Timer off) |
196 |
else |
197 |
@@ -275,8 +275,8 @@ |
198 |
AC_ARG_ENABLE([omp-packing], |
199 |
[AC_HELP_STRING([--enable-omp-packing], |
200 |
[enable OpenMP multithreaded packing])], |
201 |
- with_omp=1,with_omp=0) |
202 |
-if test ${with_omp} -eq 1 |
203 |
+ with_omp=$enableval,with_omp=no) |
204 |
+if test x"${with_omp}" = x"yes" |
205 |
then |
206 |
AC_DEFINE(OMP_PACKING,1,1->OpenMP packing 0->single thread packing) |
207 |
else |
208 |
@@ -312,7 +312,7 @@ |
209 |
AC_ARG_ENABLE([jpeg], |
210 |
[AC_HELP_STRING([--disable-jpeg], |
211 |
[disable jpeg 2000 for grib 2 decoding/encoding])], |
212 |
- without_jpeg=1,without_jpeg=0) |
213 |
+ with_jpeg=$enableval,with_jpeg=yes) |
214 |
|
215 |
AC_ARG_WITH([jasper], |
216 |
[AC_HELP_STRING([--with-jasper=JASPER], |
217 |
@@ -342,7 +342,7 @@ |
218 |
LDFLAGS="$LDFLAGS -L${openjpeg_dir}/lib" |
219 |
fi |
220 |
|
221 |
-if test $without_jpeg -ne 1 |
222 |
+if test x"$with_jpeg" = x"yes" |
223 |
then |
224 |
AC_DEFINE(HAVE_JPEG,1,JPEG enabled) |
225 |
AC_CHECK_LIB(jasper,jas_stream_memopen,jasper_ok=1,jasper_ok=0) |
226 |
@@ -429,9 +429,9 @@ |
227 |
AC_ARG_ENABLE([install-system-perl], |
228 |
[AC_HELP_STRING([--enable-install-system-perl], |
229 |
[perl modules will install in the standard perl installation ])], |
230 |
- enable_perl_install='yes', enable_perl_install='no') |
231 |
+ enable_perl_install=$enableval, enable_perl_install=no) |
232 |
|
233 |
-if test "$enable_perl_install" = 'yes' |
234 |
+if test x"$enable_perl_install" = x"yes" |
235 |
then |
236 |
PERL_INSTALL_OPTIONS="" |
237 |
fi |
238 |
@@ -461,7 +461,7 @@ |
239 |
builddir=`pwd` |
240 |
|
241 |
dnl Options to pass when configuring Perl grib_api |
242 |
-GRIB_API_LIB="${builddir}/src/grib_api.a" |
243 |
+GRIB_API_LIB="${builddir}/src/libgrib_api.la" |
244 |
GRIB_API_INC="${builddir}/src" |
245 |
AC_ARG_WITH([perl-options], |
246 |
[AC_HELP_STRING([--with-perl-options=[OPTIONS]], [options to pass on command-line when |
247 |
diff -Nur grib_api-1.9.9.orig/definitions/installDefinitions.sh grib_api-1.9.9/definitions/installDefinitions.sh |
248 |
--- grib_api-1.9.9.orig/definitions/installDefinitions.sh 2010-05-10 16:25:15.000000000 +0100 |
249 |
+++ grib_api-1.9.9/definitions/installDefinitions.sh 2011-03-08 17:20:10.000000000 +0000 |
250 |
@@ -44,7 +44,7 @@ |
251 |
echo checking definition files compatibility... |
252 |
for file in `find . -name '*.def' -print` |
253 |
do |
254 |
- ${grib_api_bin}/parser $file |
255 |
+ ${grib_api_bin}/grib_parser $file |
256 |
done |
257 |
if [ $? != 0 ] |
258 |
then |
259 |
diff -Nur grib_api-1.9.9.orig/examples/C/Makefile.am grib_api-1.9.9/examples/C/Makefile.am |
260 |
--- grib_api-1.9.9.orig/examples/C/Makefile.am 2010-09-15 16:12:55.000000000 +0100 |
261 |
+++ grib_api-1.9.9/examples/C/Makefile.am 2011-03-08 17:20:10.000000000 +0000 |
262 |
@@ -30,7 +30,7 @@ |
263 |
|
264 |
INCLUDES = -I$(top_builddir)/src |
265 |
|
266 |
-LDADD = $(top_builddir)/src/libgrib_api.a |
267 |
+LDADD = $(top_builddir)/src/libgrib_api.la |
268 |
DEPENDENCIES = $(LDADD) |
269 |
|
270 |
EXTRA_DIST =$(TESTS) include.sh |
271 |
diff -Nur grib_api-1.9.9.orig/examples/F90/Makefile.am grib_api-1.9.9/examples/F90/Makefile.am |
272 |
--- grib_api-1.9.9.orig/examples/F90/Makefile.am 2010-04-01 10:21:30.000000000 +0100 |
273 |
+++ grib_api-1.9.9/examples/F90/Makefile.am 2011-03-08 17:20:10.000000000 +0000 |
274 |
@@ -37,7 +37,7 @@ |
275 |
|
276 |
AM_FCFLAGS = $(F90_MODULE_FLAG)$(top_builddir)/fortran |
277 |
|
278 |
-LDADD = $(top_builddir)/fortran/libgrib_api_f90.a $(top_builddir)/src/libgrib_api.a |
279 |
+LDADD = $(top_builddir)/fortran/libgrib_api_f90.la $(top_builddir)/src/libgrib_api.la |
280 |
DEPENDENCIES = $(LDADD) |
281 |
|
282 |
EXTRA_DIST =$(TESTS) include.sh |
283 |
diff -Nur grib_api-1.9.9.orig/examples/python/include.sh grib_api-1.9.9/examples/python/include.sh |
284 |
--- grib_api-1.9.9.orig/examples/python/include.sh 2011-02-17 11:24:13.000000000 +0000 |
285 |
+++ grib_api-1.9.9/examples/python/include.sh 2011-03-08 17:20:10.000000000 +0000 |
286 |
@@ -14,6 +14,8 @@ |
287 |
|
288 |
PYTHONPATH=$cpath/python:$PYTHONPATH |
289 |
export PYTHONPATH |
290 |
+LD_LIBRARY_PATH=$cpath/src/.libs:$LD_LIBRARY_PATH |
291 |
+export LD_LIBRARY_PATH |
292 |
|
293 |
set -u |
294 |
|
295 |
diff -Nur grib_api-1.9.9.orig/examples/python/Makefile.am grib_api-1.9.9/examples/python/Makefile.am |
296 |
--- grib_api-1.9.9.orig/examples/python/Makefile.am 2011-02-17 11:24:13.000000000 +0000 |
297 |
+++ grib_api-1.9.9/examples/python/Makefile.am 2011-03-08 17:20:10.000000000 +0000 |
298 |
@@ -10,7 +10,7 @@ |
299 |
iterator_SOURCES = iterator.c |
300 |
count_messages_SOURCES = count_messages.c |
301 |
INCLUDES = -I$(top_builddir)/src |
302 |
-LDADD = $(top_builddir)/src/libgrib_api.a |
303 |
+LDADD = $(top_builddir)/src/libgrib_api.la |
304 |
DEPENDENCIES = $(LDADD) |
305 |
|
306 |
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 binary_message.py set_pv.py |
307 |
diff -Nur grib_api-1.9.9.orig/fortran/Makefile.am grib_api-1.9.9/fortran/Makefile.am |
308 |
--- grib_api-1.9.9.orig/fortran/Makefile.am 2009-11-24 11:51:52.000000000 +0000 |
309 |
+++ grib_api-1.9.9/fortran/Makefile.am 2011-03-08 17:20:10.000000000 +0000 |
310 |
@@ -2,14 +2,14 @@ |
311 |
|
312 |
AM_CFLAGS = @WARN_PEDANTIC@ |
313 |
|
314 |
-lib_LIBRARIES = libgrib_api_f77.a libgrib_api_f90.a |
315 |
+lib_LTLIBRARIES = libgrib_api_f77.la libgrib_api_f90.la |
316 |
include_HEADERS = grib_api_f77.h |
317 |
|
318 |
-libgrib_api_f77_a_SOURCES= grib_fortran.c grib_f77.c |
319 |
-libgrib_api_f77_a_DEPENDENCIES = $(top_builddir)/src/libgrib_api.a |
320 |
+libgrib_api_f77_la_SOURCES= grib_fortran.c grib_f77.c |
321 |
+libgrib_api_f77_la_DEPENDENCIES = $(top_builddir)/src/libgrib_api.la |
322 |
|
323 |
-libgrib_api_f90_a_SOURCES= grib_fortran.c grib_f90.f90 |
324 |
-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 |
325 |
+libgrib_api_f90_la_SOURCES= grib_fortran.c grib_f90.f90 |
326 |
+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 |
327 |
|
328 |
libgrib_api_fortran_prototypes= grib_fortran.c |
329 |
|
330 |
@@ -26,7 +26,7 @@ |
331 |
|
332 |
## Make sure these will be cleaned even when they're not built by |
333 |
## default. |
334 |
-CLEANFILES = libgrib_api_f77.a libgrib_api_f90.a grib_f90.f90 *.mod grib_types grib_kinds.h |
335 |
+CLEANFILES = libgrib_api_f77.la libgrib_api_f90.la grib_f90.f90 *.mod grib_types grib_kinds.h |
336 |
|
337 |
#noinst_HEADERS = |
338 |
|
339 |
diff -Nur grib_api-1.9.9.orig/perl/GRIB-API/Makefile.PL.in grib_api-1.9.9/perl/GRIB-API/Makefile.PL.in |
340 |
--- grib_api-1.9.9.orig/perl/GRIB-API/Makefile.PL.in 2009-11-24 11:51:53.000000000 +0000 |
341 |
+++ grib_api-1.9.9/perl/GRIB-API/Makefile.PL.in 2011-03-08 17:20:10.000000000 +0000 |
342 |
@@ -19,5 +19,5 @@ |
343 |
INC => '-I@GRIB_API_INC@', # e.g., '-I. -I/usr/include/other' |
344 |
# Un-comment this if you add C files to link with later: |
345 |
# OBJECT => '$(O_FILES)', # link all the C files too |
346 |
- depend => { "API.o" => "../../src/libgrib_api.a" } |
347 |
+ depend => { "API.o" => "../../src/libgrib_api.la" } |
348 |
); |
349 |
diff -Nur grib_api-1.9.9.orig/perl/Makefile.am grib_api-1.9.9/perl/Makefile.am |
350 |
--- grib_api-1.9.9.orig/perl/Makefile.am 2010-03-19 11:25:53.000000000 +0000 |
351 |
+++ grib_api-1.9.9/perl/Makefile.am 2011-03-08 17:20:10.000000000 +0000 |
352 |
@@ -16,10 +16,10 @@ |
353 |
$(PERLMAKEFILE): $(PERLMAKEMAKER) |
354 |
cd $(API_DIR) && @PERL@ Makefile.PL @PERL_INSTALL_OPTIONS@ @PERL_MAKE_OPTIONS@ @PERL_LD_OPTIONS@ |
355 |
|
356 |
-$(PERLLIB): $(PERLMAKEFILE) $(top_builddir)/src/libgrib_api.a |
357 |
+$(PERLLIB): $(PERLMAKEFILE) $(top_builddir)/src/libgrib_api.la |
358 |
cd $(API_DIR) && $(MAKE) |
359 |
|
360 |
-$(top_builddir)/src/libgrib_api.a: $(top_builddir)/src/Makefile |
361 |
+$(top_builddir)/src/libgrib_api.la: $(top_builddir)/src/Makefile |
362 |
cd $(top_builddir)/src && $(MAKE) |
363 |
|
364 |
install-exec-perl: $(PERLMAKEFILE) |
365 |
diff -Nur grib_api-1.9.9.orig/python/setup.py.in grib_api-1.9.9/python/setup.py.in |
366 |
--- grib_api-1.9.9.orig/python/setup.py.in 2010-10-08 16:00:49.000000000 +0100 |
367 |
+++ grib_api-1.9.9/python/setup.py.in 2011-03-08 17:20:10.000000000 +0000 |
368 |
@@ -17,7 +17,8 @@ |
369 |
build_dir = '@BUILD_DIR@' |
370 |
add_attribute( |
371 |
include_dirs = os.path.join(build_dir,'src'), |
372 |
- extra_objects = os.path.join(build_dir,'src','libgrib_api.a') |
373 |
+ library_dirs = os.path.join(build_dir,'src','.libs'), |
374 |
+ libraries = 'grib_api' |
375 |
) |
376 |
|
377 |
with_jasper = '@LIB_JASPER@' |
378 |
diff -Nur grib_api-1.9.9.orig/src/extrules.am grib_api-1.9.9/src/extrules.am |
379 |
--- grib_api-1.9.9.orig/src/extrules.am 2010-10-05 11:21:12.000000000 +0100 |
380 |
+++ grib_api-1.9.9/src/extrules.am 2011-03-08 17:20:10.000000000 +0000 |
381 |
@@ -9,7 +9,7 @@ |
382 |
cmp ../python/grib_errors.h grib_errors.h.new || (p4 edit ../python/grib_errors.h ; cp grib_errors.h.new ../python/grib_errors.h) |
383 |
|
384 |
|
385 |
-proto:;-p4 edit grib_api_prototypes.h;mkptypes -A $(libgrib_api_a_prototypes) $(libgrib_api_extra_prototypes) > grib_api_prototypes.h |
386 |
+proto:;-p4 edit grib_api_prototypes.h;mkptypes -A $(libgrib_api_la_prototypes) $(libgrib_api_extra_prototypes) > grib_api_prototypes.h |
387 |
test:all;(cd ../tests; make tests) |
388 |
|
389 |
templates: |
390 |
diff -Nur grib_api-1.9.9.orig/src/Makefile.am grib_api-1.9.9/src/Makefile.am |
391 |
--- grib_api-1.9.9.orig/src/Makefile.am 2011-02-04 14:38:58.000000000 +0000 |
392 |
+++ grib_api-1.9.9/src/Makefile.am 2011-03-08 17:20:10.000000000 +0000 |
393 |
@@ -7,10 +7,10 @@ |
394 |
# -DYYDEBUG |
395 |
|
396 |
|
397 |
-lib_LIBRARIES = libgrib_api.a |
398 |
+lib_LTLIBRARIES = libgrib_api.la |
399 |
include_HEADERS = grib_api.h |
400 |
|
401 |
-libgrib_api_a_prototypes= \ |
402 |
+libgrib_api_la_prototypes= \ |
403 |
action.c \ |
404 |
action_class_alias.c \ |
405 |
action_class_gen.c \ |
406 |
@@ -142,7 +142,6 @@ |
407 |
grib_accessor_class_spectral_truncation.c \ |
408 |
grib_accessor_class_time.c \ |
409 |
grib_accessor_class_transient.c \ |
410 |
- grib_accessor_class_g1_half_byte_codeflag.c \ |
411 |
grib_accessor_class_values.c \ |
412 |
grib_accessor_class_simple_packing_error.c \ |
413 |
grib_accessor_class_data_simple_packing.c \ |
414 |
@@ -285,10 +284,10 @@ |
415 |
|
416 |
libgrib_api_extra_prototypes = grib_bits_any_endian.c grib_bits_any_endian_simple.c |
417 |
|
418 |
-libgrib_api_a_SOURCES = $(libgrib_api_a_prototypes) grib_yacc.c grib_lex.c |
419 |
+libgrib_api_la_SOURCES = $(libgrib_api_la_prototypes) grib_yacc.c grib_lex.c |
420 |
|
421 |
-libgrib_api_a_LIBADD = @LIBOBJS@ |
422 |
-libgrib_api_a_DEPENDENCIES = grib_api.h $(libgrib_api_a_LIBADD) |
423 |
+libgrib_api_la_LIBADD = @LIBOBJS@ |
424 |
+libgrib_api_la_DEPENDENCIES = grib_api.h $(libgrib_api_la_LIBADD) |
425 |
|
426 |
|
427 |
# set the include path |
428 |
@@ -296,7 +295,7 @@ |
429 |
|
430 |
## Make sure these will be cleaned even when they're not built by |
431 |
## default. |
432 |
-CLEANFILES = libgrib_api.a |
433 |
+CLEANFILES = libgrib_api.la |
434 |
|
435 |
|
436 |
noinst_HEADERS = grib_api_internal.h \ |
437 |
diff -Nur grib_api-1.9.9.orig/tests/definitions.sh grib_api-1.9.9/tests/definitions.sh |
438 |
--- grib_api-1.9.9.orig/tests/definitions.sh 2010-06-17 15:00:13.000000000 +0100 |
439 |
+++ grib_api-1.9.9/tests/definitions.sh 2011-03-08 17:20:10.000000000 +0000 |
440 |
@@ -15,6 +15,6 @@ |
441 |
|
442 |
for file in `find $GRIB_DEFINITION_PATH -name '*.def' -print` |
443 |
do |
444 |
- ${tools_dir}parser $file > $REDIRECT |
445 |
+ ${tools_dir}grib_parser $file > $REDIRECT |
446 |
done |
447 |
|
448 |
diff -Nur grib_api-1.9.9.orig/tests/Makefile.am grib_api-1.9.9/tests/Makefile.am |
449 |
--- grib_api-1.9.9.orig/tests/Makefile.am 2010-12-02 14:54:51.000000000 +0000 |
450 |
+++ grib_api-1.9.9/tests/Makefile.am 2011-03-08 17:20:10.000000000 +0000 |
451 |
@@ -31,7 +31,7 @@ |
452 |
gribex_perf_SOURCES = gribex_perf.c |
453 |
gribex_perf_SOURCES = gauss_sub.c |
454 |
|
455 |
- LDADD = $(top_builddir)/src/libgrib_api.a $(EMOS_LIB) |
456 |
+ LDADD = $(top_builddir)/src/libgrib_api.la $(EMOS_LIB) |
457 |
|
458 |
INCLUDES = -I$(top_builddir)/src |
459 |
|
460 |
diff -Nur grib_api-1.9.9.orig/tigge/Makefile.am grib_api-1.9.9/tigge/Makefile.am |
461 |
--- grib_api-1.9.9.orig/tigge/Makefile.am 2010-02-17 16:53:55.000000000 +0000 |
462 |
+++ grib_api-1.9.9/tigge/Makefile.am 2011-03-08 17:20:10.000000000 +0000 |
463 |
@@ -12,5 +12,5 @@ |
464 |
|
465 |
INCLUDES = -I$(top_builddir)/src |
466 |
|
467 |
-LDADD = $(top_builddir)/src/libgrib_api.a |
468 |
+LDADD = $(top_builddir)/src/libgrib_api.la |
469 |
DEPENDENCIES = $(LDADD) |
470 |
diff -Nur grib_api-1.9.9.orig/tools/Makefile.am grib_api-1.9.9/tools/Makefile.am |
471 |
--- grib_api-1.9.9.orig/tools/Makefile.am 2011-01-31 16:33:49.000000000 +0000 |
472 |
+++ grib_api-1.9.9/tools/Makefile.am 2011-03-08 17:22:25.000000000 +0000 |
473 |
@@ -3,9 +3,9 @@ |
474 |
|
475 |
AM_YFLAGS = -d |
476 |
|
477 |
-noinst_LIBRARIES = libgrib_tools.a |
478 |
+noinst_LTLIBRARIES = libgrib_tools.la |
479 |
|
480 |
-libgrib_tools_a_SOURCES = grib_tools.c \ |
481 |
+libgrib_tools_la_SOURCES = grib_tools.c \ |
482 |
grib_options.c |
483 |
|
484 |
|
485 |
@@ -13,7 +13,7 @@ |
486 |
grib_debug grib_info grib_filter grib_ls grib_dump \ |
487 |
grib2ppm grib_set grib_get grib_get_data grib_copy grib_repair \ |
488 |
grib_packing grib_cmp grib_convert grib_distance grib_corruption_check\ |
489 |
- grib_compare grib_list_keys parser grib_count grib_index_build grib1to2 \ |
490 |
+ grib_compare grib_list_keys grib_parser grib_count grib_index_build grib1to2 \ |
491 |
gg_sub_area_check grib_moments |
492 |
|
493 |
noinst_PROGRAMS = gaussian grib_diff mars_request xref all_keys #compile #dumpload grib_compare_old |
494 |
@@ -31,7 +31,7 @@ |
495 |
grib_histogram_SOURCES = grib_histogram.c |
496 |
grib_distance_SOURCES = grib_distance.c |
497 |
grib_debug_SOURCES = grib_debug.c |
498 |
-parser_SOURCES = parser.c |
499 |
+grib_parser_SOURCES = parser.c |
500 |
grib_list_keys_SOURCES = list_keys.c |
501 |
all_keys_SOURCES = all_keys.c |
502 |
grib2ppm_SOURCES = grib2ppm.c |
503 |
@@ -62,12 +62,12 @@ |
504 |
|
505 |
INCLUDES = -I$(top_builddir)/src |
506 |
|
507 |
-LDADD = libgrib_tools.a $(top_builddir)/src/libgrib_api.a |
508 |
+LDADD = libgrib_tools.la $(top_builddir)/src/libgrib_api.la |
509 |
DEPENDENCIES = $(LDADD) |
510 |
|
511 |
## Make sure these will be cleaned even when they're not built by |
512 |
## default. |
513 |
-CLEANFILES = libgrib_tools.a |
514 |
+CLEANFILES = libgrib_tools.la |
515 |
|
516 |
grib1to2$(EXEEXT): grib1to2.txt |
517 |
sed "s:toolsdir:$(bindir):" grib1to2.txt > grib1to2 |