Author: frankie
Date: 2009-09-21 15:41:10 +0000 (Mon, 21 Sep 2009)
New Revision: 2478
Removed:
packages/netcdf/trunk/debian/patches/arm-double-byte-ordering-support.diff
packages/netcdf/trunk/debian/patches/g++-4.3-headers.diff
Modified:
packages/netcdf/trunk/debian/patches/series
Log:
Cleaned patch set
Deleted:
packages/netcdf/trunk/debian/patches/arm-double-byte-ordering-support.diff
===================================================================
--- packages/netcdf/trunk/debian/patches/arm-double-byte-ordering-support.diff
2009-09-21 15:39:18 UTC (rev 2477)
+++ packages/netcdf/trunk/debian/patches/arm-double-byte-ordering-support.diff
2009-09-21 15:41:10 UTC (rev 2478)
@@ -1,146 +0,0 @@
-Add support for old style ARM architecture
-
-This patch adds support for old style arm architecture. I added an autoconf
-macro to acinclude.m4 to detect the double byte order on ARM properly and
-changed libsrc/ncx.m4 to swap bytes properly on ARM.
-Index: netcdf-3.6.2/acinclude.m4
-===================================================================
---- netcdf-3.6.2.orig/acinclude.m4 2008-02-27 22:10:39.000000000 -0800
-+++ netcdf-3.6.2/acinclude.m4 2008-02-27 22:11:38.000000000 -0800
-@@ -839,4 +839,63 @@
- AC_MSG_ERROR([unable to find compiler flag for modules inclusion])
- fi
- AC_LANG_POP(Fortran)
--])])
-\ No newline at end of file
-+])])
-+
-+# AX_C_FLOAT_WORDS_BIGENDIAN
-+# added by:
-+# Warren Turkal <w...@penguintechs.org>
-+#
-+# Copyright © 2006 Daniel Amelang <d...@amelang.net>
-+#
-+# Copying and distribution of this file, with or without modification, are
-+# permitted in any medium without royalty provided the copyright notice and
-+# this notice are preserved.
-+#
-+# This macro will detect if double variables are words are packed in big
endian
-+# order while the bits in the words are arranged in little endian order. This
-+# macro was added to support the ARM architecture. The FLOAT_WORDS_BIGENDIAN
-+# macro will be set to 1 if the word order is big endian. If the word order is
-+# not big endian, FLOAT_WORDS_BIGENDIAN will be not be set.
-+AC_DEFUN([AX_C_FLOAT_WORDS_BIGENDIAN],
-+ [AC_CACHE_CHECK(whether float word ordering is bigendian,
-+ ax_cv_c_float_words_bigendian, [
-+
-+ax_cv_c_float_words_bigendian=unknown
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-+
-+double d =
90904234967036810337470478905505011476211692735615632014797120844053488865816695273723469097858056257517020191247487429516932130503560650002327564517570778480236724525140520121371739201496540132640109977779420565776568942592.0;
-+
-+]])], [
-+
-+if grep noonsees conftest.$ac_objext >/dev/null ; then
-+ ax_cv_c_float_words_bigendian=yes
-+fi
-+if grep seesnoon conftest.$ac_objext >/dev/null ; then
-+ if test "$ax_cv_c_float_words_bigendian" = unknown; then
-+ ax_cv_c_float_words_bigendian=no
-+ else
-+ ax_cv_c_float_words_bigendian=unknown
-+ fi
-+fi
-+
-+])])
-+
-+case $ax_cv_c_float_words_bigendian in
-+ yes)
-+ m4_default([$1],
-+ [AC_DEFINE([FLOAT_WORDS_BIGENDIAN], 1,
-+ [Define to 1 if your system stores words within floats
-+ with the most significant word first])]) ;;
-+ no)
-+ $2 ;;
-+ *)
-+ m4_default([$3],
-+ [AC_MSG_ERROR([
-+
-+Unknown float word ordering. You need to manually preset
-+ax_cv_c_float_words_bigendian=no (or yes) according to your system.
-+
-+ ])]) ;;
-+esac
-+
-+])# AX_C_FLOAT_WORDS_BIGENDIAN
-Index: netcdf-3.6.2/configure.ac
-===================================================================
---- netcdf-3.6.2.orig/configure.ac 2008-02-27 22:10:39.000000000 -0800
-+++ netcdf-3.6.2/configure.ac 2008-02-27 22:11:38.000000000 -0800
-@@ -676,6 +676,7 @@
- #AC_CHECK_TYPE(uchar, unsigned char)
- AC_C_CHAR_UNSIGNED
- AC_C_BIGENDIAN
-+AX_C_FLOAT_WORDS_BIGENDIAN
- AC_CHECK_SIZEOF(short)
- AC_CHECK_SIZEOF(int)
- AC_CHECK_SIZEOF(long)
-Index: netcdf-3.6.2/libsrc/ncx.m4
-===================================================================
---- netcdf-3.6.2.orig/libsrc/ncx.m4 2008-02-27 22:18:57.000000000 -0800
-+++ netcdf-3.6.2/libsrc/ncx.m4 2008-02-27 22:26:35.000000000 -0800
-@@ -198,6 +198,7 @@
- {
- char *op = dst;
- const char *ip = src;
-+# ifndef FLOAT_WORDS_BIGENDIAN
- op[0] = ip[7];
- op[1] = ip[6];
- op[2] = ip[5];
-@@ -206,6 +207,16 @@
- op[5] = ip[2];
- op[6] = ip[1];
- op[7] = ip[0];
-+# else
-+ op[0] = ip[3];
-+ op[1] = ip[2];
-+ op[2] = ip[1];
-+ op[3] = ip[0];
-+ op[4] = ip[7];
-+ op[5] = ip[6];
-+ op[6] = ip[5];
-+ op[7] = ip[4];
-+# endif
- }
- # endif /* !vax */
-
-@@ -231,6 +242,7 @@
- * ip += 8;
- * }
- */
-+# ifndef FLOAT_WORDS_BIGENDIAN
- while(nn > 1)
- {
- op[0] = ip[7];
-@@ -266,6 +278,21 @@
- op += 8;
- ip += 8;
- }
-+# else
-+ while(nn-- != 0)
-+ {
-+ op[0] = ip[3];
-+ op[1] = ip[2];
-+ op[2] = ip[1];
-+ op[3] = ip[0];
-+ op[4] = ip[7];
-+ op[5] = ip[6];
-+ op[6] = ip[5];
-+ op[7] = ip[4];
-+ op += 8;
-+ ip += 8;
-+ }
-+# endif
- }
- # endif /* !vax */
-
Deleted: packages/netcdf/trunk/debian/patches/g++-4.3-headers.diff
===================================================================
--- packages/netcdf/trunk/debian/patches/g++-4.3-headers.diff 2009-09-21
15:39:18 UTC (rev 2477)
+++ packages/netcdf/trunk/debian/patches/g++-4.3-headers.diff 2009-09-21
15:41:10 UTC (rev 2478)
@@ -1,22 +0,0 @@
-Add headers needed for compilation using g++ version 4.3. (#455285)
---- netcdf-3.6.2/cxx/ncvalues.cpp~ 2008-04-05 23:34:57.000000000 +0000
-+++ netcdf-3.6.2/cxx/ncvalues.cpp 2008-04-05 23:28:55.000000000 +0000
-@@ -9,7 +9,7 @@
-
- #include <config.h>
- #include <iostream>
--#include <string>
-+#include <cstring>
-
- #include "ncvalues.h"
-
---- netcdf-3.6.2/examples/CXX/sfc_pres_temp_rd.cpp~ 2008-04-05
23:36:05.000000000 +0000
-+++ netcdf-3.6.2/examples/CXX/sfc_pres_temp_rd.cpp 2008-04-05
23:29:03.000000000 +0000
-@@ -17,6 +17,7 @@
- */
-
- #include <iostream>
-+#include <cstring>
- #include <netcdfcpp.h>
-
- using namespace std;
Modified: packages/netcdf/trunk/debian/patches/series
===================================================================
--- packages/netcdf/trunk/debian/patches/series 2009-09-21 15:39:18 UTC (rev
2477)
+++ packages/netcdf/trunk/debian/patches/series 2009-09-21 15:41:10 UTC (rev
2478)
@@ -1,2 +1 @@
-#arm-double-byte-ordering-support.diff
-#g++-4.3-headers.diff
+# no patches currently
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
