Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/grib_api/files: grib_api-1.9.9-autotools.patch
Date: Mon, 27 Feb 2012 18:18:29
Message-Id: 20120227181819.6E3442004C@flycatcher.gentoo.org
1 bicatali 12/02/27 18:18:19
2
3 Modified: grib_api-1.9.9-autotools.patch
4 Log:
5 Install samples in proper FHS directory. Python routines now installed without changing PYTHONPATH (bug #405177). Switchd to EAPI4
6
7 (Portage version: 2.1.10.44/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 sci-libs/grib_api/files/grib_api-1.9.9-autotools.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/grib_api/files/grib_api-1.9.9-autotools.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/grib_api/files/grib_api-1.9.9-autotools.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/grib_api/files/grib_api-1.9.9-autotools.patch?r1=1.1&r2=1.2
15
16 Index: grib_api-1.9.9-autotools.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sci-libs/grib_api/files/grib_api-1.9.9-autotools.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- grib_api-1.9.9-autotools.patch 20 Nov 2011 20:34:45 -0000 1.1
23 +++ grib_api-1.9.9-autotools.patch 27 Feb 2012 18:18:19 -0000 1.2
24 @@ -1,6 +1,6 @@
25 diff -Nur grib_api-1.9.9.orig/configure.ac grib_api-1.9.9/configure.ac
26 ---- grib_api-1.9.9.orig/configure.ac 2010-10-19 13:19:26.000000000 +0100
27 -+++ grib_api-1.9.9/configure.ac 2011-03-08 17:20:10.000000000 +0000
28 +--- grib_api-1.9.9.orig/configure.ac 2012-02-27 17:41:54.000000000 +0000
29 ++++ grib_api-1.9.9/configure.ac 2012-02-27 18:08:55.000000000 +0000
30 @@ -24,21 +24,9 @@
31 AC_CONFIG_HEADER([src/config.h])
32 AM_INIT_AUTOMAKE($PACKAGE_NAME,[${PACKAGE_VERSION}],[http://www.ecmwf.int])
33 @@ -138,6 +138,15 @@
34 then
35 FORTRAN_MOD=fortran
36 AC_SUBST(FORTRAN_MOD)
37 +@@ -221,7 +221,7 @@
38 + then
39 + IFS_SAMPLES_DIR=$ifs_samples
40 + else
41 +- IFS_SAMPLES_DIR=${prefix}/ifs_samples
42 ++ IFS_SAMPLES_DIR=${datadir}/$PACKAGE_NAME/ifs_samples
43 + fi
44 + AC_SUBST([IFS_SAMPLES_DIR])
45 +
46 @@ -262,8 +262,8 @@
47 AC_ARG_ENABLE([timer],
48 [AC_HELP_STRING([--enable-timer],
49 @@ -160,7 +169,16 @@
50 then
51 AC_DEFINE(OMP_PACKING,1,1->OpenMP packing 0->single thread packing)
52 else
53 -@@ -312,7 +312,7 @@
54 +@@ -291,8 +291,6 @@
55 + if test $netcdf_dir != 'none'
56 + then
57 + with_netcdf=1
58 +- CFLAGS="$CFLAGS -I${netcdf_dir}/include"
59 +- LDFLAGS="$LDFLAGS -L${netcdf_dir}/lib"
60 + AC_CHECK_LIB(netcdf,nc_open,netcdf_ok=1,netcdf_ok=0)
61 + if test $netcdf_ok -eq 0
62 + then
63 +@@ -312,7 +310,7 @@
64 AC_ARG_ENABLE([jpeg],
65 [AC_HELP_STRING([--disable-jpeg],
66 [disable jpeg 2000 for grib 2 decoding/encoding])],
67 @@ -169,16 +187,35 @@
68
69 AC_ARG_WITH([jasper],
70 [AC_HELP_STRING([--with-jasper=JASPER],
71 -@@ -342,7 +342,7 @@
72 - LDFLAGS="$LDFLAGS -L${openjpeg_dir}/lib"
73 - fi
74 -
75 +@@ -322,12 +320,6 @@
76 + JASPER_DIR=$jasper_dir
77 + AC_SUBST(JASPER_DIR)
78 +
79 +-if test $jasper_dir != 'system'
80 +-then
81 +- CFLAGS="$CFLAGS -I${jasper_dir}/include"
82 +- LDFLAGS="$LDFLAGS -L${jasper_dir}/lib"
83 +-fi
84 +-
85 + AC_ARG_WITH([openjpeg],
86 + [AC_HELP_STRING([--with-openjpeg=OPENJPEG],
87 + [use specified openjpeg installation directory])],
88 +@@ -336,13 +328,7 @@
89 + OPENJPEG_DIR=$openjpeg_dir
90 + AC_SUBST(OPENJPEG_DIR)
91 +
92 +-if test $openjpeg_dir != 'system'
93 +-then
94 +- CFLAGS="$CFLAGS -I${openjpeg_dir}/include"
95 +- LDFLAGS="$LDFLAGS -L${openjpeg_dir}/lib"
96 +-fi
97 +-
98 -if test $without_jpeg -ne 1
99 +if test x"$with_jpeg" = x"yes"
100 then
101 AC_DEFINE(HAVE_JPEG,1,JPEG enabled)
102 AC_CHECK_LIB(jasper,jas_stream_memopen,jasper_ok=1,jasper_ok=0)
103 -@@ -429,9 +429,9 @@
104 +@@ -429,9 +415,9 @@
105 AC_ARG_ENABLE([install-system-perl],
106 [AC_HELP_STRING([--enable-install-system-perl],
107 [perl modules will install in the standard perl installation ])],
108 @@ -190,7 +227,7 @@
109 then
110 PERL_INSTALL_OPTIONS=""
111 fi
112 -@@ -461,7 +461,7 @@
113 +@@ -461,7 +447,7 @@
114 builddir=`pwd`
115
116 dnl Options to pass when configuring Perl grib_api
117 @@ -200,8 +237,8 @@
118 AC_ARG_WITH([perl-options],
119 [AC_HELP_STRING([--with-perl-options=[OPTIONS]], [options to pass on command-line when
120 diff -Nur grib_api-1.9.9.orig/definitions/installDefinitions.sh grib_api-1.9.9/definitions/installDefinitions.sh
121 ---- grib_api-1.9.9.orig/definitions/installDefinitions.sh 2010-05-10 16:25:15.000000000 +0100
122 -+++ grib_api-1.9.9/definitions/installDefinitions.sh 2011-03-08 17:20:10.000000000 +0000
123 +--- grib_api-1.9.9.orig/definitions/installDefinitions.sh 2012-02-27 17:41:54.000000000 +0000
124 ++++ grib_api-1.9.9/definitions/installDefinitions.sh 2012-02-27 17:42:14.000000000 +0000
125 @@ -44,7 +44,7 @@
126 echo checking definition files compatibility...
127 for file in `find . -name '*.def' -print`
128 @@ -212,8 +249,8 @@
129 if [ $? != 0 ]
130 then
131 diff -Nur grib_api-1.9.9.orig/examples/C/Makefile.am grib_api-1.9.9/examples/C/Makefile.am
132 ---- grib_api-1.9.9.orig/examples/C/Makefile.am 2010-09-15 16:12:55.000000000 +0100
133 -+++ grib_api-1.9.9/examples/C/Makefile.am 2011-03-08 17:20:10.000000000 +0000
134 +--- grib_api-1.9.9.orig/examples/C/Makefile.am 2012-02-27 17:41:54.000000000 +0000
135 ++++ grib_api-1.9.9/examples/C/Makefile.am 2012-02-27 17:42:14.000000000 +0000
136 @@ -30,7 +30,7 @@
137
138 INCLUDES = -I$(top_builddir)/src
139 @@ -224,8 +261,8 @@
140
141 EXTRA_DIST =$(TESTS) include.sh
142 diff -Nur grib_api-1.9.9.orig/examples/F90/Makefile.am grib_api-1.9.9/examples/F90/Makefile.am
143 ---- grib_api-1.9.9.orig/examples/F90/Makefile.am 2010-04-01 10:21:30.000000000 +0100
144 -+++ grib_api-1.9.9/examples/F90/Makefile.am 2011-03-08 17:20:10.000000000 +0000
145 +--- grib_api-1.9.9.orig/examples/F90/Makefile.am 2012-02-27 17:41:54.000000000 +0000
146 ++++ grib_api-1.9.9/examples/F90/Makefile.am 2012-02-27 17:42:14.000000000 +0000
147 @@ -37,7 +37,7 @@
148
149 AM_FCFLAGS = $(F90_MODULE_FLAG)$(top_builddir)/fortran
150 @@ -236,8 +273,8 @@
151
152 EXTRA_DIST =$(TESTS) include.sh
153 diff -Nur grib_api-1.9.9.orig/examples/python/include.sh grib_api-1.9.9/examples/python/include.sh
154 ---- grib_api-1.9.9.orig/examples/python/include.sh 2011-02-17 11:24:13.000000000 +0000
155 -+++ grib_api-1.9.9/examples/python/include.sh 2011-03-08 17:20:10.000000000 +0000
156 +--- grib_api-1.9.9.orig/examples/python/include.sh 2012-02-27 17:41:54.000000000 +0000
157 ++++ grib_api-1.9.9/examples/python/include.sh 2012-02-27 17:42:14.000000000 +0000
158 @@ -14,6 +14,8 @@
159
160 PYTHONPATH=$cpath/python:$PYTHONPATH
161 @@ -248,8 +285,8 @@
162 set -u
163
164 diff -Nur grib_api-1.9.9.orig/examples/python/Makefile.am grib_api-1.9.9/examples/python/Makefile.am
165 ---- grib_api-1.9.9.orig/examples/python/Makefile.am 2011-02-17 11:24:13.000000000 +0000
166 -+++ grib_api-1.9.9/examples/python/Makefile.am 2011-03-08 17:20:10.000000000 +0000
167 +--- grib_api-1.9.9.orig/examples/python/Makefile.am 2012-02-27 17:41:54.000000000 +0000
168 ++++ grib_api-1.9.9/examples/python/Makefile.am 2012-02-27 17:42:14.000000000 +0000
169 @@ -10,7 +10,7 @@
170 iterator_SOURCES = iterator.c
171 count_messages_SOURCES = count_messages.c
172 @@ -260,8 +297,8 @@
173
174 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
175 diff -Nur grib_api-1.9.9.orig/fortran/Makefile.am grib_api-1.9.9/fortran/Makefile.am
176 ---- grib_api-1.9.9.orig/fortran/Makefile.am 2009-11-24 11:51:52.000000000 +0000
177 -+++ grib_api-1.9.9/fortran/Makefile.am 2011-03-08 17:20:10.000000000 +0000
178 +--- grib_api-1.9.9.orig/fortran/Makefile.am 2012-02-27 17:41:54.000000000 +0000
179 ++++ grib_api-1.9.9/fortran/Makefile.am 2012-02-27 17:42:14.000000000 +0000
180 @@ -2,14 +2,14 @@
181
182 AM_CFLAGS = @WARN_PEDANTIC@
183 @@ -292,8 +329,8 @@
184 #noinst_HEADERS =
185
186 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
187 ---- grib_api-1.9.9.orig/perl/GRIB-API/Makefile.PL.in 2009-11-24 11:51:53.000000000 +0000
188 -+++ grib_api-1.9.9/perl/GRIB-API/Makefile.PL.in 2011-03-08 17:20:10.000000000 +0000
189 +--- grib_api-1.9.9.orig/perl/GRIB-API/Makefile.PL.in 2012-02-27 17:41:54.000000000 +0000
190 ++++ grib_api-1.9.9/perl/GRIB-API/Makefile.PL.in 2012-02-27 17:42:14.000000000 +0000
191 @@ -19,5 +19,5 @@
192 INC => '-I@GRIB_API_INC@', # e.g., '-I. -I/usr/include/other'
193 # Un-comment this if you add C files to link with later:
194 @@ -302,8 +339,8 @@
195 + depend => { "API.o" => "../../src/libgrib_api.la" }
196 );
197 diff -Nur grib_api-1.9.9.orig/perl/Makefile.am grib_api-1.9.9/perl/Makefile.am
198 ---- grib_api-1.9.9.orig/perl/Makefile.am 2010-03-19 11:25:53.000000000 +0000
199 -+++ grib_api-1.9.9/perl/Makefile.am 2011-03-08 17:20:10.000000000 +0000
200 +--- grib_api-1.9.9.orig/perl/Makefile.am 2012-02-27 17:41:54.000000000 +0000
201 ++++ grib_api-1.9.9/perl/Makefile.am 2012-02-27 17:42:14.000000000 +0000
202 @@ -16,10 +16,10 @@
203 $(PERLMAKEFILE): $(PERLMAKEMAKER)
204 cd $(API_DIR) && @PERL@ Makefile.PL @PERL_INSTALL_OPTIONS@ @PERL_MAKE_OPTIONS@ @PERL_LD_OPTIONS@
205 @@ -317,9 +354,21 @@
206 cd $(top_builddir)/src && $(MAKE)
207
208 install-exec-perl: $(PERLMAKEFILE)
209 +diff -Nur grib_api-1.9.9.orig/python/Makefile.am grib_api-1.9.9/python/Makefile.am
210 +--- grib_api-1.9.9.orig/python/Makefile.am 2012-02-27 17:41:54.000000000 +0000
211 ++++ grib_api-1.9.9/python/Makefile.am 2012-02-27 17:56:09.000000000 +0000
212 +@@ -23,7 +23,7 @@
213 + swig_wrap_numpy.py
214 +
215 + # What I want installed
216 +-pdir = $(libdir)/python$(PYTHON_VERSION)/site-packages/grib_api
217 ++pdir = $(libdir)/python$(PYTHON_VERSION)/site-packages
218 + p_DATA = \
219 + _gribapi_swig.so \
220 + gribapi.py \
221 diff -Nur grib_api-1.9.9.orig/python/setup.py.in grib_api-1.9.9/python/setup.py.in
222 ---- grib_api-1.9.9.orig/python/setup.py.in 2010-10-08 16:00:49.000000000 +0100
223 -+++ grib_api-1.9.9/python/setup.py.in 2011-03-08 17:20:10.000000000 +0000
224 +--- grib_api-1.9.9.orig/python/setup.py.in 2012-02-27 17:41:54.000000000 +0000
225 ++++ grib_api-1.9.9/python/setup.py.in 2012-02-27 17:42:14.000000000 +0000
226 @@ -17,7 +17,8 @@
227 build_dir = '@BUILD_DIR@'
228 add_attribute(
229 @@ -331,8 +380,8 @@
230
231 with_jasper = '@LIB_JASPER@'
232 diff -Nur grib_api-1.9.9.orig/src/extrules.am grib_api-1.9.9/src/extrules.am
233 ---- grib_api-1.9.9.orig/src/extrules.am 2010-10-05 11:21:12.000000000 +0100
234 -+++ grib_api-1.9.9/src/extrules.am 2011-03-08 17:20:10.000000000 +0000
235 +--- grib_api-1.9.9.orig/src/extrules.am 2012-02-27 17:41:54.000000000 +0000
236 ++++ grib_api-1.9.9/src/extrules.am 2012-02-27 17:42:14.000000000 +0000
237 @@ -9,7 +9,7 @@
238 cmp ../python/grib_errors.h grib_errors.h.new || (p4 edit ../python/grib_errors.h ; cp grib_errors.h.new ../python/grib_errors.h)
239
240 @@ -343,8 +392,8 @@
241
242 templates:
243 diff -Nur grib_api-1.9.9.orig/src/Makefile.am grib_api-1.9.9/src/Makefile.am
244 ---- grib_api-1.9.9.orig/src/Makefile.am 2011-02-04 14:38:58.000000000 +0000
245 -+++ grib_api-1.9.9/src/Makefile.am 2011-03-08 17:20:10.000000000 +0000
246 +--- grib_api-1.9.9.orig/src/Makefile.am 2012-02-27 17:41:54.000000000 +0000
247 ++++ grib_api-1.9.9/src/Makefile.am 2012-02-27 17:42:14.000000000 +0000
248 @@ -7,10 +7,10 @@
249 # -DYYDEBUG
250
251 @@ -358,7 +407,7 @@
252 action.c \
253 action_class_alias.c \
254 action_class_gen.c \
255 -@@ -142,7 +142,6 @@
256 +@@ -143,7 +143,6 @@
257 grib_accessor_class_spectral_truncation.c \
258 grib_accessor_class_time.c \
259 grib_accessor_class_transient.c \
260 @@ -366,7 +415,7 @@
261 grib_accessor_class_values.c \
262 grib_accessor_class_simple_packing_error.c \
263 grib_accessor_class_data_simple_packing.c \
264 -@@ -285,10 +284,10 @@
265 +@@ -286,10 +285,10 @@
266
267 libgrib_api_extra_prototypes = grib_bits_any_endian.c grib_bits_any_endian_simple.c
268
269 @@ -380,7 +429,7 @@
270
271
272 # set the include path
273 -@@ -296,7 +295,7 @@
274 +@@ -297,7 +296,7 @@
275
276 ## Make sure these will be cleaned even when they're not built by
277 ## default.
278 @@ -390,8 +439,8 @@
279
280 noinst_HEADERS = grib_api_internal.h \
281 diff -Nur grib_api-1.9.9.orig/tests/definitions.sh grib_api-1.9.9/tests/definitions.sh
282 ---- grib_api-1.9.9.orig/tests/definitions.sh 2010-06-17 15:00:13.000000000 +0100
283 -+++ grib_api-1.9.9/tests/definitions.sh 2011-03-08 17:20:10.000000000 +0000
284 +--- grib_api-1.9.9.orig/tests/definitions.sh 2012-02-27 17:41:54.000000000 +0000
285 ++++ grib_api-1.9.9/tests/definitions.sh 2012-02-27 17:42:14.000000000 +0000
286 @@ -15,6 +15,6 @@
287
288 for file in `find $GRIB_DEFINITION_PATH -name '*.def' -print`
289 @@ -401,8 +450,8 @@
290 done
291
292 diff -Nur grib_api-1.9.9.orig/tests/Makefile.am grib_api-1.9.9/tests/Makefile.am
293 ---- grib_api-1.9.9.orig/tests/Makefile.am 2010-12-02 14:54:51.000000000 +0000
294 -+++ grib_api-1.9.9/tests/Makefile.am 2011-03-08 17:20:10.000000000 +0000
295 +--- grib_api-1.9.9.orig/tests/Makefile.am 2012-02-27 17:41:54.000000000 +0000
296 ++++ grib_api-1.9.9/tests/Makefile.am 2012-02-27 17:42:14.000000000 +0000
297 @@ -31,7 +31,7 @@
298 gribex_perf_SOURCES = gribex_perf.c
299 gribex_perf_SOURCES = gauss_sub.c
300 @@ -413,8 +462,8 @@
301 INCLUDES = -I$(top_builddir)/src
302
303 diff -Nur grib_api-1.9.9.orig/tigge/Makefile.am grib_api-1.9.9/tigge/Makefile.am
304 ---- grib_api-1.9.9.orig/tigge/Makefile.am 2010-02-17 16:53:55.000000000 +0000
305 -+++ grib_api-1.9.9/tigge/Makefile.am 2011-03-08 17:20:10.000000000 +0000
306 +--- grib_api-1.9.9.orig/tigge/Makefile.am 2012-02-27 17:41:54.000000000 +0000
307 ++++ grib_api-1.9.9/tigge/Makefile.am 2012-02-27 17:42:14.000000000 +0000
308 @@ -12,5 +12,5 @@
309
310 INCLUDES = -I$(top_builddir)/src
311 @@ -423,8 +472,8 @@
312 +LDADD = $(top_builddir)/src/libgrib_api.la
313 DEPENDENCIES = $(LDADD)
314 diff -Nur grib_api-1.9.9.orig/tools/Makefile.am grib_api-1.9.9/tools/Makefile.am
315 ---- grib_api-1.9.9.orig/tools/Makefile.am 2011-01-31 16:33:49.000000000 +0000
316 -+++ grib_api-1.9.9/tools/Makefile.am 2011-03-08 17:22:25.000000000 +0000
317 +--- grib_api-1.9.9.orig/tools/Makefile.am 2012-02-27 17:41:54.000000000 +0000
318 ++++ grib_api-1.9.9/tools/Makefile.am 2012-02-27 17:42:14.000000000 +0000
319 @@ -3,9 +3,9 @@
320
321 AM_YFLAGS = -d
Report Message
Find on MARC Find on Google Groups