diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2011-11-20 20:34:45 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2011-11-20 20:34:45 +0000 |
commit | 003bdd6ef027cea08c8e8c4ed8a831bc01747917 (patch) | |
tree | 9ab4d3895f509d5148f4190ed9feeef94c168397 | |
parent | Version bump. (diff) | |
download | historical-003bdd6ef027cea08c8e8c4ed8a831bc01747917.tar.gz historical-003bdd6ef027cea08c8e8c4ed8a831bc01747917.tar.bz2 historical-003bdd6ef027cea08c8e8c4ed8a831bc01747917.zip |
Version bump. Still patch the normal version since the autotools does not have the perl bindings. Fix bug #378167, thanks tove.
Package-Manager: portage-2.1.10.36/cvs/Linux x86_64
-rw-r--r-- | sci-libs/grib_api/ChangeLog | 9 | ||||
-rw-r--r-- | sci-libs/grib_api/Manifest | 14 | ||||
-rw-r--r-- | sci-libs/grib_api/files/grib_api-1.9.9-autotools.patch | 472 | ||||
-rw-r--r-- | sci-libs/grib_api/files/grib_api-1.9.9-ieeefloat.patch | 18 | ||||
-rw-r--r-- | sci-libs/grib_api/grib_api-1.9.9.ebuild | 62 |
5 files changed, 569 insertions, 6 deletions
diff --git a/sci-libs/grib_api/ChangeLog b/sci-libs/grib_api/ChangeLog index 035d10d72ec6..765060e23aa1 100644 --- a/sci-libs/grib_api/ChangeLog +++ b/sci-libs/grib_api/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-libs/grib_api # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/grib_api/ChangeLog,v 1.5 2011/06/21 15:18:12 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/grib_api/ChangeLog,v 1.6 2011/11/20 20:34:45 bicatali Exp $ + +*grib_api-1.9.9 (20 Nov 2011) + + 20 Nov 2011; SĂ©bastien Fabbro <bicatali@gentoo.org> +grib_api-1.9.9.ebuild, + +files/grib_api-1.9.9-autotools.patch, +files/grib_api-1.9.9-ieeefloat.patch: + Version bump. Still patch the normal version since the autotools does not + have the perl bindings. Fix bug #378167, thanks tove. 21 Jun 2011; Justin Lecher <jlec@gentoo.org> grib_api-1.9.5-r1.ebuild: Add dependency on virtual/fortran diff --git a/sci-libs/grib_api/Manifest b/sci-libs/grib_api/Manifest index a4e5c3aa23f3..202a2d41b43f 100644 --- a/sci-libs/grib_api/Manifest +++ b/sci-libs/grib_api/Manifest @@ -3,14 +3,18 @@ Hash: SHA1 AUX grib_api-1.9.5-32bit.patch 714 RMD160 e74d83441b841d01461a3fe1dab19da2b768c19a SHA1 66bc600e3ae086bf58dbb3cecb5c9e5d7f27d333 SHA256 3c34e481b41fd36390daa6cb5c20d00b5df29e75d561413b8d6c852e776216d6 AUX grib_api-1.9.5-autotools.patch 18564 RMD160 612b32ebfddfa83278b1b9e60ffdaa0a1dd01a6f SHA1 bde7a32b0f61e1921ea3eed25f9c073d149e4116 SHA256 f09112c393b5d0e62de5a6ad9f78a320393cbfa10c4d04ba1f16558e53795fbe +AUX grib_api-1.9.9-autotools.patch 17626 RMD160 2856f832d5bed6aca26440a57290e5a8299dde25 SHA1 958edceb4b9c6864ff1ef5399afd2b3c361dfe02 SHA256 f1b8ce7f9e34b9fbfb6a9f927337ecb702eff3c0dd9231a1c8fb8a161c9bc54b +AUX grib_api-1.9.9-ieeefloat.patch 489 RMD160 3bb3c94e46dc94f95553cbb51a8e6f14e6e4e682 SHA1 efdb32af533e3757ca2ad898201e36b26fa1c01d SHA256 1319874c0b76698b940514feb3444e6d858f479feca376c33cbbbd41ed5d9747 DIST grib_api-1.9.5.tar.gz 6031267 RMD160 b0067f8b99a341d44ed1e2b1569cd7b8dba09c69 SHA1 278ca8213ea358b58a295774d66efcb65046b104 SHA256 1fbaa92e9f026548b7260e77dbd0e8201bd5629240ec4d157d6322cf7444137f +DIST grib_api-1.9.9.tar.gz 6269463 RMD160 fb2fa217edf7c07b432af91337da3cf04039fd9c SHA1 f16333363f35cbcab496118afe1fe21ae743b756 SHA256 9fef7ce41301e94ef7151d786d7000d6db94c578e32b04497f7ee1f124985ce0 EBUILD grib_api-1.9.5-r1.ebuild 1454 RMD160 980c8562bc75bd253d438bf2732b2bce5b4ec0b0 SHA1 107c361c2b2d24dd991493d28362c0e9aa350caf SHA256 9b4870de04f82750b966a1339cc944a924d0b2d607d0cc846c67e31f78be084f -MISC ChangeLog 1034 RMD160 8c5f51b31e769a81c6c6e5f206ec7115b253c830 SHA1 8092c9d3446ecd8f81a8ba9d6b83d757b28ea7b5 SHA256 015b7aa0c8dce614819b9f813ecd3a2f2c252bbd85aae8faafb00c0b9052695d +EBUILD grib_api-1.9.9.ebuild 1595 RMD160 24a29400f030e37ce6eae761de6d728cc37fda53 SHA1 5dccfafe033197166da7ae4d0bcff508a9675939 SHA256 56ddb5ff6ee2dead341225cd2c48f4516f7230d9128edf49afd345edb16cf07e +MISC ChangeLog 1361 RMD160 8bda29423eaedce401135e10f31b748d60212889 SHA1 430f1ff1b9e72b7921b62a21e3d023ef26d7810f SHA256 4da8ed58be6afbcb4160796d17653e9c560cbeba5e6b7b7eb393961d00fc78c2 MISC metadata.xml 547 RMD160 027cff497339b515ee70e6a88002b6a13ae0636b SHA1 2178680f3965b593491d88e874777af50e2451ac SHA256 d8075d9dc0ecd812d815ff4a8ceb01209b7576160a1a8bc6bd5ac0aae88ba609 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk4AtjUACgkQgAnW8HDreRbX7wCfYfv2q7jnriIgd51QVuLhRyhE -5/4AnjfZ1XwWVuL1pbUF6YTy/8/BrCsu -=HJ+X +iEYEARECAAYFAk7JZG4ACgkQ1ycZbhPLE2DUrQCgsadTHNnnhHqOjDZrSZW8+nAw +uAoAmgM24POF0szJ4WJsp+FA+zaQF7Gi +=4pDk -----END PGP SIGNATURE----- diff --git a/sci-libs/grib_api/files/grib_api-1.9.9-autotools.patch b/sci-libs/grib_api/files/grib_api-1.9.9-autotools.patch new file mode 100644 index 000000000000..75ed88c1356f --- /dev/null +++ b/sci-libs/grib_api/files/grib_api-1.9.9-autotools.patch @@ -0,0 +1,472 @@ +diff -Nur grib_api-1.9.9.orig/configure.ac grib_api-1.9.9/configure.ac +--- grib_api-1.9.9.orig/configure.ac 2010-10-19 13:19:26.000000000 +0100 ++++ grib_api-1.9.9/configure.ac 2011-03-08 17:20:10.000000000 +0000 +@@ -24,21 +24,9 @@ + AC_CONFIG_HEADER([src/config.h]) + AM_INIT_AUTOMAKE($PACKAGE_NAME,[${PACKAGE_VERSION}],[http://www.ecmwf.int]) + +-definition_files_path=/usr/local/share/grib_api/definitions +-samples_files_path=/usr/local/share/grib_api/samples +-default_perl_install='${prefix}/perl' +- +- +-if test "$prefix" != 'NONE' ; then +- definition_files_path=${prefix}/share/definitions +- samples_files_path=${prefix}/share/samples +- default_perl_install=${prefix}/perl +-fi +- +-if test "$datadir" != '${datarootdir}' ; then +- definition_files_path=$datadir/definitions +-fi +- ++definition_files_path=${datadir}/$PACKAGE_NAME/definitions ++samples_files_path=${datadir}/$PACKAGE_NAME/samples ++default_perl_install=${prefix}/perl + + AC_DEFINE_UNQUOTED(GRIB_API_MAIN_VERSION,$GRIB_API_MAIN_VERSION,Grib Api version) + AC_DEFINE_UNQUOTED(GRIB_API_MAJOR_VERSION,$GRIB_API_MAJOR_VERSION,Grib Api Major release) +@@ -62,19 +50,20 @@ + AC_PROG_LEX + AC_PROG_F77(pgf90 pgf77 xlf gfortran f77 g77 f90 ifort) + AC_PROG_FC(pgf90 xlf90 gfortran f90 ifort) ++AC_PROG_LIBTOOL + + dnl check availability of pthreads + AC_ARG_ENABLE([pthread], + [AC_HELP_STRING([--enable-pthread], +- [enable POSIX thread ])], +- GRIB_PTHREADS=1 , GRIB_PTHREADS=0 +-) ++ [enable POSIX thread ])]) + +-if test $GRIB_PTHREADS -eq 1 ++if test x"$enable_pthread" = x"yes" + then ++GRIB_PTHREADS=1 + AC_GRIB_PTHREADS + AC_GRIB_LINUX_PTHREADS + else ++GRIB_PTHREADS=0 + GRIB_LINUX_PTHREADS=0 + fi + +@@ -97,9 +86,9 @@ + AC_ARG_ENABLE([ieee-native], + [AC_HELP_STRING([--disable-ieee-native], + [disable ieee native packing])], +- without_ieee=1,without_ieee=0) ++ with_ieee=$enableval,with_ieee=no) + +-if test $without_ieee -eq 1 ++if test x"$with_ieee" = x"yes" + then + AC_DEFINE_UNQUOTED(IEEE_LE,0,1-> ieee little endian float/double 0->no ieee little endian float/double) + AC_DEFINE_UNQUOTED(IEEE_BE,0,1-> ieee big endian float/double 0->no ieee big endian float/double) +@@ -120,36 +109,47 @@ + AC_ARG_ENABLE([align-memory], + [AC_HELP_STRING([--enable-align-memory], + [enable memory alignement])], +-AC_DEFINE_UNQUOTED(GRIB_MEM_ALIGN,1,memory alignment required) , +- ) ++with_mem_align=$enableval) + ++if test x"$with_mem_align" = x"yes" ++then ++AC_DEFINE_UNQUOTED(GRIB_MEM_ALIGN,1,memory alignment required) ++fi + dnl use vectorised code + AC_ARG_ENABLE([vector], + [AC_HELP_STRING([--enable-vector], + [enable vectorised code ])], +- vectorise=1,vectorise=0) +- ++ with_vectorise=$enableval, vectorise=0) ++if test x"$with_vectorise" = x"yes" ++then ++vectorise=1 ++fi + AC_DEFINE_UNQUOTED(VECTOR,$vectorise,vectorised code) + + dnl enable memory management + AC_ARG_ENABLE([memory-management], + [AC_HELP_STRING([--enable-memory-management], + [enable memory ])], +-AC_DEFINE_UNQUOTED(MANAGE_MEM,1,memory management) , ++with_manage_mem=$enableval, + AC_DEFINE_UNQUOTED(MANAGE_MEM,0,memory management) + ) ++if test x"$with_manage_mem" = x"yes" ++then ++AC_DEFINE_UNQUOTED(MANAGE_MEM,1,memory management) ++fi + + dnl enable development configuration + DEVEL_RULES='' + AC_ARG_ENABLE([development], + [AC_HELP_STRING([--enable-development], +- [enable development configuration ])], +- GRIB_DEVEL=1 , GRIB_DEVEL=0 +-) +-if test $GRIB_DEVEL -eq 1 ++ [enable development configuration ])]) ++ ++if test x"$enable_development" = x"yes" + then ++ GRIB_DEVEL=1 + DEVEL_RULES='extrules.am' + else ++ GRIB_DEVEL=0 + DEVEL_RULES='dummy.am' + fi + AC_SUBST(DEVEL_RULES) +@@ -186,14 +186,14 @@ + AC_ARG_ENABLE([fortran], + [AC_HELP_STRING([--disable-fortran], + [disable fortran interface])], +- without_fortran=1,without_fortran=0) ++ with_fortran=$enableval,with_fortran=yes) + + if test "x$FC" = "x" + then +- without_fortran=1 ++ with_fortran=no + fi + +-if test $without_fortran -ne 1 ++if test x$"with_fortran" = x"yes" + then + FORTRAN_MOD=fortran + AC_SUBST(FORTRAN_MOD) +@@ -262,8 +262,8 @@ + AC_ARG_ENABLE([timer], + [AC_HELP_STRING([--enable-timer], + [enable timer])], +- with_timer=1,with_timer=0) +-if test ${with_timer} -eq 1 ++ with_timer=$enable_val,with_timer=no) ++if test x"${with_timer}" = x"yes" + then + AC_DEFINE(GRIB_TIMER,1,1->Timer on 0->Timer off) + else +@@ -275,8 +275,8 @@ + AC_ARG_ENABLE([omp-packing], + [AC_HELP_STRING([--enable-omp-packing], + [enable OpenMP multithreaded packing])], +- with_omp=1,with_omp=0) +-if test ${with_omp} -eq 1 ++ with_omp=$enableval,with_omp=no) ++if test x"${with_omp}" = x"yes" + then + AC_DEFINE(OMP_PACKING,1,1->OpenMP packing 0->single thread packing) + else +@@ -312,7 +312,7 @@ + AC_ARG_ENABLE([jpeg], + [AC_HELP_STRING([--disable-jpeg], + [disable jpeg 2000 for grib 2 decoding/encoding])], +- without_jpeg=1,without_jpeg=0) ++ with_jpeg=$enableval,with_jpeg=yes) + + AC_ARG_WITH([jasper], + [AC_HELP_STRING([--with-jasper=JASPER], +@@ -342,7 +342,7 @@ + LDFLAGS="$LDFLAGS -L${openjpeg_dir}/lib" + fi + +-if test $without_jpeg -ne 1 ++if test x"$with_jpeg" = x"yes" + then + AC_DEFINE(HAVE_JPEG,1,JPEG enabled) + AC_CHECK_LIB(jasper,jas_stream_memopen,jasper_ok=1,jasper_ok=0) +@@ -429,9 +429,9 @@ + AC_ARG_ENABLE([install-system-perl], + [AC_HELP_STRING([--enable-install-system-perl], + [perl modules will install in the standard perl installation ])], +- enable_perl_install='yes', enable_perl_install='no') ++ enable_perl_install=$enableval, enable_perl_install=no) + +-if test "$enable_perl_install" = 'yes' ++if test x"$enable_perl_install" = x"yes" + then + PERL_INSTALL_OPTIONS="" + fi +@@ -461,7 +461,7 @@ + builddir=`pwd` + + dnl Options to pass when configuring Perl grib_api +-GRIB_API_LIB="${builddir}/src/grib_api.a" ++GRIB_API_LIB="${builddir}/src/libgrib_api.la" + GRIB_API_INC="${builddir}/src" + AC_ARG_WITH([perl-options], + [AC_HELP_STRING([--with-perl-options=[OPTIONS]], [options to pass on command-line when +diff -Nur grib_api-1.9.9.orig/definitions/installDefinitions.sh grib_api-1.9.9/definitions/installDefinitions.sh +--- grib_api-1.9.9.orig/definitions/installDefinitions.sh 2010-05-10 16:25:15.000000000 +0100 ++++ grib_api-1.9.9/definitions/installDefinitions.sh 2011-03-08 17:20:10.000000000 +0000 +@@ -44,7 +44,7 @@ + echo checking definition files compatibility... + for file in `find . -name '*.def' -print` + do +- ${grib_api_bin}/parser $file ++ ${grib_api_bin}/grib_parser $file + done + if [ $? != 0 ] + then +diff -Nur grib_api-1.9.9.orig/examples/C/Makefile.am grib_api-1.9.9/examples/C/Makefile.am +--- grib_api-1.9.9.orig/examples/C/Makefile.am 2010-09-15 16:12:55.000000000 +0100 ++++ grib_api-1.9.9/examples/C/Makefile.am 2011-03-08 17:20:10.000000000 +0000 +@@ -30,7 +30,7 @@ + + INCLUDES = -I$(top_builddir)/src + +-LDADD = $(top_builddir)/src/libgrib_api.a ++LDADD = $(top_builddir)/src/libgrib_api.la + DEPENDENCIES = $(LDADD) + + EXTRA_DIST =$(TESTS) include.sh +diff -Nur grib_api-1.9.9.orig/examples/F90/Makefile.am grib_api-1.9.9/examples/F90/Makefile.am +--- grib_api-1.9.9.orig/examples/F90/Makefile.am 2010-04-01 10:21:30.000000000 +0100 ++++ grib_api-1.9.9/examples/F90/Makefile.am 2011-03-08 17:20:10.000000000 +0000 +@@ -37,7 +37,7 @@ + + AM_FCFLAGS = $(F90_MODULE_FLAG)$(top_builddir)/fortran + +-LDADD = $(top_builddir)/fortran/libgrib_api_f90.a $(top_builddir)/src/libgrib_api.a ++LDADD = $(top_builddir)/fortran/libgrib_api_f90.la $(top_builddir)/src/libgrib_api.la + DEPENDENCIES = $(LDADD) + + EXTRA_DIST =$(TESTS) include.sh +diff -Nur grib_api-1.9.9.orig/examples/python/include.sh grib_api-1.9.9/examples/python/include.sh +--- grib_api-1.9.9.orig/examples/python/include.sh 2011-02-17 11:24:13.000000000 +0000 ++++ grib_api-1.9.9/examples/python/include.sh 2011-03-08 17:20:10.000000000 +0000 +@@ -14,6 +14,8 @@ + + PYTHONPATH=$cpath/python:$PYTHONPATH + export PYTHONPATH ++LD_LIBRARY_PATH=$cpath/src/.libs:$LD_LIBRARY_PATH ++export LD_LIBRARY_PATH + + set -u + +diff -Nur grib_api-1.9.9.orig/examples/python/Makefile.am grib_api-1.9.9/examples/python/Makefile.am +--- grib_api-1.9.9.orig/examples/python/Makefile.am 2011-02-17 11:24:13.000000000 +0000 ++++ grib_api-1.9.9/examples/python/Makefile.am 2011-03-08 17:20:10.000000000 +0000 +@@ -10,7 +10,7 @@ + iterator_SOURCES = iterator.c + count_messages_SOURCES = count_messages.c + INCLUDES = -I$(top_builddir)/src +-LDADD = $(top_builddir)/src/libgrib_api.a ++LDADD = $(top_builddir)/src/libgrib_api.la + DEPENDENCIES = $(LDADD) + + 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 +diff -Nur grib_api-1.9.9.orig/fortran/Makefile.am grib_api-1.9.9/fortran/Makefile.am +--- grib_api-1.9.9.orig/fortran/Makefile.am 2009-11-24 11:51:52.000000000 +0000 ++++ grib_api-1.9.9/fortran/Makefile.am 2011-03-08 17:20:10.000000000 +0000 +@@ -2,14 +2,14 @@ + + AM_CFLAGS = @WARN_PEDANTIC@ + +-lib_LIBRARIES = libgrib_api_f77.a libgrib_api_f90.a ++lib_LTLIBRARIES = libgrib_api_f77.la libgrib_api_f90.la + include_HEADERS = grib_api_f77.h + +-libgrib_api_f77_a_SOURCES= grib_fortran.c grib_f77.c +-libgrib_api_f77_a_DEPENDENCIES = $(top_builddir)/src/libgrib_api.a ++libgrib_api_f77_la_SOURCES= grib_fortran.c grib_f77.c ++libgrib_api_f77_la_DEPENDENCIES = $(top_builddir)/src/libgrib_api.la + +-libgrib_api_f90_a_SOURCES= grib_fortran.c grib_f90.f90 +-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 ++libgrib_api_f90_la_SOURCES= grib_fortran.c grib_f90.f90 ++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 + + libgrib_api_fortran_prototypes= grib_fortran.c + +@@ -26,7 +26,7 @@ + + ## Make sure these will be cleaned even when they're not built by + ## default. +-CLEANFILES = libgrib_api_f77.a libgrib_api_f90.a grib_f90.f90 *.mod grib_types grib_kinds.h ++CLEANFILES = libgrib_api_f77.la libgrib_api_f90.la grib_f90.f90 *.mod grib_types grib_kinds.h + + #noinst_HEADERS = + +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 +--- grib_api-1.9.9.orig/perl/GRIB-API/Makefile.PL.in 2009-11-24 11:51:53.000000000 +0000 ++++ grib_api-1.9.9/perl/GRIB-API/Makefile.PL.in 2011-03-08 17:20:10.000000000 +0000 +@@ -19,5 +19,5 @@ + INC => '-I@GRIB_API_INC@', # e.g., '-I. -I/usr/include/other' + # Un-comment this if you add C files to link with later: + # OBJECT => '$(O_FILES)', # link all the C files too +- depend => { "API.o" => "../../src/libgrib_api.a" } ++ depend => { "API.o" => "../../src/libgrib_api.la" } + ); +diff -Nur grib_api-1.9.9.orig/perl/Makefile.am grib_api-1.9.9/perl/Makefile.am +--- grib_api-1.9.9.orig/perl/Makefile.am 2010-03-19 11:25:53.000000000 +0000 ++++ grib_api-1.9.9/perl/Makefile.am 2011-03-08 17:20:10.000000000 +0000 +@@ -16,10 +16,10 @@ + $(PERLMAKEFILE): $(PERLMAKEMAKER) + cd $(API_DIR) && @PERL@ Makefile.PL @PERL_INSTALL_OPTIONS@ @PERL_MAKE_OPTIONS@ @PERL_LD_OPTIONS@ + +-$(PERLLIB): $(PERLMAKEFILE) $(top_builddir)/src/libgrib_api.a ++$(PERLLIB): $(PERLMAKEFILE) $(top_builddir)/src/libgrib_api.la + cd $(API_DIR) && $(MAKE) + +-$(top_builddir)/src/libgrib_api.a: $(top_builddir)/src/Makefile ++$(top_builddir)/src/libgrib_api.la: $(top_builddir)/src/Makefile + cd $(top_builddir)/src && $(MAKE) + + install-exec-perl: $(PERLMAKEFILE) +diff -Nur grib_api-1.9.9.orig/python/setup.py.in grib_api-1.9.9/python/setup.py.in +--- grib_api-1.9.9.orig/python/setup.py.in 2010-10-08 16:00:49.000000000 +0100 ++++ grib_api-1.9.9/python/setup.py.in 2011-03-08 17:20:10.000000000 +0000 +@@ -17,7 +17,8 @@ + build_dir = '@BUILD_DIR@' + add_attribute( + include_dirs = os.path.join(build_dir,'src'), +- extra_objects = os.path.join(build_dir,'src','libgrib_api.a') ++ library_dirs = os.path.join(build_dir,'src','.libs'), ++ libraries = 'grib_api' + ) + + with_jasper = '@LIB_JASPER@' +diff -Nur grib_api-1.9.9.orig/src/extrules.am grib_api-1.9.9/src/extrules.am +--- grib_api-1.9.9.orig/src/extrules.am 2010-10-05 11:21:12.000000000 +0100 ++++ grib_api-1.9.9/src/extrules.am 2011-03-08 17:20:10.000000000 +0000 +@@ -9,7 +9,7 @@ + cmp ../python/grib_errors.h grib_errors.h.new || (p4 edit ../python/grib_errors.h ; cp grib_errors.h.new ../python/grib_errors.h) + + +-proto:;-p4 edit grib_api_prototypes.h;mkptypes -A $(libgrib_api_a_prototypes) $(libgrib_api_extra_prototypes) > grib_api_prototypes.h ++proto:;-p4 edit grib_api_prototypes.h;mkptypes -A $(libgrib_api_la_prototypes) $(libgrib_api_extra_prototypes) > grib_api_prototypes.h + test:all;(cd ../tests; make tests) + + templates: +diff -Nur grib_api-1.9.9.orig/src/Makefile.am grib_api-1.9.9/src/Makefile.am +--- grib_api-1.9.9.orig/src/Makefile.am 2011-02-04 14:38:58.000000000 +0000 ++++ grib_api-1.9.9/src/Makefile.am 2011-03-08 17:20:10.000000000 +0000 +@@ -7,10 +7,10 @@ + # -DYYDEBUG + + +-lib_LIBRARIES = libgrib_api.a ++lib_LTLIBRARIES = libgrib_api.la + include_HEADERS = grib_api.h + +-libgrib_api_a_prototypes= \ ++libgrib_api_la_prototypes= \ + action.c \ + action_class_alias.c \ + action_class_gen.c \ +@@ -142,7 +142,6 @@ + grib_accessor_class_spectral_truncation.c \ + grib_accessor_class_time.c \ + grib_accessor_class_transient.c \ +- grib_accessor_class_g1_half_byte_codeflag.c \ + grib_accessor_class_values.c \ + grib_accessor_class_simple_packing_error.c \ + grib_accessor_class_data_simple_packing.c \ +@@ -285,10 +284,10 @@ + + libgrib_api_extra_prototypes = grib_bits_any_endian.c grib_bits_any_endian_simple.c + +-libgrib_api_a_SOURCES = $(libgrib_api_a_prototypes) grib_yacc.c grib_lex.c ++libgrib_api_la_SOURCES = $(libgrib_api_la_prototypes) grib_yacc.c grib_lex.c + +-libgrib_api_a_LIBADD = @LIBOBJS@ +-libgrib_api_a_DEPENDENCIES = grib_api.h $(libgrib_api_a_LIBADD) ++libgrib_api_la_LIBADD = @LIBOBJS@ ++libgrib_api_la_DEPENDENCIES = grib_api.h $(libgrib_api_la_LIBADD) + + + # set the include path +@@ -296,7 +295,7 @@ + + ## Make sure these will be cleaned even when they're not built by + ## default. +-CLEANFILES = libgrib_api.a ++CLEANFILES = libgrib_api.la + + + noinst_HEADERS = grib_api_internal.h \ +diff -Nur grib_api-1.9.9.orig/tests/definitions.sh grib_api-1.9.9/tests/definitions.sh +--- grib_api-1.9.9.orig/tests/definitions.sh 2010-06-17 15:00:13.000000000 +0100 ++++ grib_api-1.9.9/tests/definitions.sh 2011-03-08 17:20:10.000000000 +0000 +@@ -15,6 +15,6 @@ + + for file in `find $GRIB_DEFINITION_PATH -name '*.def' -print` + do +- ${tools_dir}parser $file > $REDIRECT ++ ${tools_dir}grib_parser $file > $REDIRECT + done + +diff -Nur grib_api-1.9.9.orig/tests/Makefile.am grib_api-1.9.9/tests/Makefile.am +--- grib_api-1.9.9.orig/tests/Makefile.am 2010-12-02 14:54:51.000000000 +0000 ++++ grib_api-1.9.9/tests/Makefile.am 2011-03-08 17:20:10.000000000 +0000 +@@ -31,7 +31,7 @@ + gribex_perf_SOURCES = gribex_perf.c + gribex_perf_SOURCES = gauss_sub.c + +- LDADD = $(top_builddir)/src/libgrib_api.a $(EMOS_LIB) ++ LDADD = $(top_builddir)/src/libgrib_api.la $(EMOS_LIB) + + INCLUDES = -I$(top_builddir)/src + +diff -Nur grib_api-1.9.9.orig/tigge/Makefile.am grib_api-1.9.9/tigge/Makefile.am +--- grib_api-1.9.9.orig/tigge/Makefile.am 2010-02-17 16:53:55.000000000 +0000 ++++ grib_api-1.9.9/tigge/Makefile.am 2011-03-08 17:20:10.000000000 +0000 +@@ -12,5 +12,5 @@ + + INCLUDES = -I$(top_builddir)/src + +-LDADD = $(top_builddir)/src/libgrib_api.a ++LDADD = $(top_builddir)/src/libgrib_api.la + DEPENDENCIES = $(LDADD) +diff -Nur grib_api-1.9.9.orig/tools/Makefile.am grib_api-1.9.9/tools/Makefile.am +--- grib_api-1.9.9.orig/tools/Makefile.am 2011-01-31 16:33:49.000000000 +0000 ++++ grib_api-1.9.9/tools/Makefile.am 2011-03-08 17:22:25.000000000 +0000 +@@ -3,9 +3,9 @@ + + AM_YFLAGS = -d + +-noinst_LIBRARIES = libgrib_tools.a ++noinst_LTLIBRARIES = libgrib_tools.la + +-libgrib_tools_a_SOURCES = grib_tools.c \ ++libgrib_tools_la_SOURCES = grib_tools.c \ + grib_options.c + + +@@ -13,7 +13,7 @@ + grib_debug grib_info grib_filter grib_ls grib_dump \ + grib2ppm grib_set grib_get grib_get_data grib_copy grib_repair \ + grib_packing grib_cmp grib_convert grib_distance grib_corruption_check\ +- grib_compare grib_list_keys parser grib_count grib_index_build grib1to2 \ ++ grib_compare grib_list_keys grib_parser grib_count grib_index_build grib1to2 \ + gg_sub_area_check grib_moments + + noinst_PROGRAMS = gaussian grib_diff mars_request xref all_keys #compile #dumpload grib_compare_old +@@ -31,7 +31,7 @@ + grib_histogram_SOURCES = grib_histogram.c + grib_distance_SOURCES = grib_distance.c + grib_debug_SOURCES = grib_debug.c +-parser_SOURCES = parser.c ++grib_parser_SOURCES = parser.c + grib_list_keys_SOURCES = list_keys.c + all_keys_SOURCES = all_keys.c + grib2ppm_SOURCES = grib2ppm.c +@@ -62,12 +62,12 @@ + + INCLUDES = -I$(top_builddir)/src + +-LDADD = libgrib_tools.a $(top_builddir)/src/libgrib_api.a ++LDADD = libgrib_tools.la $(top_builddir)/src/libgrib_api.la + DEPENDENCIES = $(LDADD) + + ## Make sure these will be cleaned even when they're not built by + ## default. +-CLEANFILES = libgrib_tools.a ++CLEANFILES = libgrib_tools.la + + grib1to2$(EXEEXT): grib1to2.txt + sed "s:toolsdir:$(bindir):" grib1to2.txt > grib1to2 diff --git a/sci-libs/grib_api/files/grib_api-1.9.9-ieeefloat.patch b/sci-libs/grib_api/files/grib_api-1.9.9-ieeefloat.patch new file mode 100644 index 000000000000..bd8456cf297f --- /dev/null +++ b/sci-libs/grib_api/files/grib_api-1.9.9-ieeefloat.patch @@ -0,0 +1,18 @@ +--- grib_api-1.9.9.orig/src/grib_ieeefloat.c 2009-11-24 11:51:55.000000000 +0000 ++++ grib_api-1.9.9/src/grib_ieeefloat.c 2011-03-08 17:36:39.000000000 +0000 +@@ -336,12 +336,13 @@ + #if IEEE_LE + unsigned char s[8]={0,}; + unsigned char* buf=(unsigned char*)&x; ++ size_t nb = sizeof(unsigned long); + int j=0; + for (j=7;j>=0;j--) + s[j]= *(buf++); +- memcpy(&lval,s,8); ++ memcpy(&lval,s,nb); + #elif IEEE_BE +- memcpy(&lval,&x,8); ++ memcpy(&lval,&x,nb); + #endif + return lval; + } diff --git a/sci-libs/grib_api/grib_api-1.9.9.ebuild b/sci-libs/grib_api/grib_api-1.9.9.ebuild new file mode 100644 index 000000000000..beccc2016d98 --- /dev/null +++ b/sci-libs/grib_api/grib_api-1.9.9.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/grib_api/grib_api-1.9.9.ebuild,v 1.1 2011/11/20 20:34:45 bicatali Exp $ + +EAPI=3 +inherit eutils autotools + +#MYP=${P}_libtool +MYP=${P} + +DESCRIPTION="Library for decoding WMO FM-92 GRIB messages" +HOMEPAGE="http://www.ecmwf.int/products/data/software/grib_api.html" +SRC_URI="http://www.ecmwf.int/products/data/software/download/software_files/${MYP}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples fortran jpeg2k netcdf openmp png perl python static-libs" + +DEPEND="jpeg2k? ( || ( media-libs/jasper media-libs/openjpeg ) ) + netcdf? ( sci-libs/netcdf ) + png? ( media-libs/libpng ) + python? ( dev-python/numpy )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MYP}" + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-ieeefloat.patch \ + "${FILESDIR}"/${P}-autotools.patch + eautoreconf +} + +src_configure() { + econf \ + --enable-install-system-perl \ + --with-perl-options=INSTALLDIRS=vendor \ + $(use_enable fortran) \ + $(use_enable jpeg2k jpeg) \ + $(use_enable openmp omp-packing) \ + $(use_enable python) \ + $(use_enable python numpy) \ + $(use_enable static-libs static) \ + $(use_with netcdf netcdf "${EPRFIX}"/usr) \ + $(use_with perl) \ + $(use_with png png-support) + +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS ChangeLog README + if use doc; then + dohtml html/* || die + fi + if use examples; then + insinto /usr/share/doc/${PF}/examples + emake clean + doins -r * || die + fi +} |