[emos] 10/14: Remove obsolete little_endian.patch
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Mar 2 11:41:30 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository emos.
commit 8e5424b388ea770cd444865967885b1301efcd0c
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Feb 3 18:59:23 2016 +0000
Remove obsolete little_endian.patch
---
debian/patches/little_endian.patch | 133 -------------------------------------
debian/patches/series | 2 -
debian/rules | 42 ++++++------
3 files changed, 19 insertions(+), 158 deletions(-)
diff --git a/debian/patches/little_endian.patch b/debian/patches/little_endian.patch
deleted file mode 100644
index 170fc5e..0000000
--- a/debian/patches/little_endian.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-Description: Use configure to detect endianness rather than setting in config files.
- Don't use LITTLE_ENDIAN as it is defined in Linux header files (even on non-LITTLE_ENDIAN platforms)
-Author: Alastair McKinstry <mckinstry at debian.org>
-Last-Updated: 2011-12-09
-Forwarded: no
-
-Index: emoslib-4.3.7/gribex/ecloc1.F
-===================================================================
---- emoslib-4.3.7.orig/gribex/ecloc1.F
-+++ emoslib-4.3.7/gribex/ecloc1.F
-@@ -69,7 +69,7 @@ C CSGNBT - encode sign bit
- C DSGNBT - decode sign bit
- C ELDEFS - encode ECMWF section 1, local usage definitions
- C DLDEFS - decode ECMWF section 1, local usage definitions
--#ifdef LITTLE_ENDIAN
-+#if !defined(WORDS_BIGENDIAN)
- C SWAP4 - swap order of characters in the experiment version
- #endif
- C
-Index: emoslib-4.3.7/gribex/fortranInterface.c
-===================================================================
---- emoslib-4.3.7.orig/gribex/fortranInterface.c
-+++ emoslib-4.3.7/gribex/fortranInterface.c
-@@ -179,7 +179,7 @@ void isec1l(fortint* section1, fortint*
-
- fortint ldefnum(fortint* centre, fortint* subcentre, fortint* number) {
- int shift = (sizeof(fortint)-1)*8;
--#ifdef LITTLE_ENDIAN
-+#if !defined(WORDS_BIGENDIAN)
- return ((*centre*1000000) + (*subcentre*1000) + (*number & 0xff));
- #else
- return ((*centre*1000000) + (*subcentre*1000) + ((*number>>shift) & 0xff));
-@@ -222,7 +222,7 @@ fortint number;
- for( loop = 7; loop >= missing; loop-- ) value[loop] = value[loop-missing];
- for( loop = 0; loop < missing; loop++ ) value[loop] = '0';
- }
--#ifdef LITTLE_ENDIAN
-+#if !defined(WORDS_BIGENDIAN)
- p = value[0];
- value[0] = value[6];
- value[6] = p;
-Index: emoslib-4.3.7/gribex/grprs1b.F
-===================================================================
---- emoslib-4.3.7.orig/gribex/grprs1b.F
-+++ emoslib-4.3.7/gribex/grprs1b.F
-@@ -519,7 +519,7 @@ C
- WRITE(GRPRSM,1105) KSEC1(44)
- WRITE(HVERSION, '(A8)' ) KSEC1(45)
- WRITE(GRPRSM,1106)
--#ifdef LITTLE_ENDIAN
-+#if !defined(WORDS_BIGENDIAN)
- X HVERSION(8:8),
- X HVERSION(7:7),
- X HVERSION(6:6),
-@@ -711,7 +711,7 @@ C
- WRITE(GRPRSM,1803) KSEC1(44)
- WRITE(HVERSION, '(A8)' ) KSEC1(45)
- WRITE(GRPRSM,1804)
--#ifdef LITTLE_ENDIAN
-+#if !defined(WORDS_BIGENDIAN)
- X HVERSION(8:8),
- X HVERSION(7:7),
- X HVERSION(6:6),
-@@ -728,7 +728,7 @@ C
- DO JLOOP = 1, KSEC1(46)
- WRITE(HVERSION, '(A8)' ) KSEC1(46+JLOOP)
- WRITE(GRPRSM,1806)
--#ifdef LITTLE_ENDIAN
-+#if !defined(WORDS_BIGENDIAN)
- X HVERSION(8:8),
- X HVERSION(7:7),
- X HVERSION(6:6),
-@@ -789,7 +789,7 @@ C
- WRITE(GRPRSM,2115) KSEC1(56)
- WRITE(GRPRSM,2116) KSEC1(57)
- WRITE(HVERSION, '(A8)' ) KSEC1(58)
--#ifdef LITTLE_ENDIAN
-+#if !defined(WORDS_BIGENDIAN)
- WRITE(GRPRSM,2117) HVERSION(5:5)
- #else
- WRITE(GRPRSM,2117) HVERSION(8:8)
-Index: emoslib-4.3.7/gribex/grprs1.F
-===================================================================
---- emoslib-4.3.7.orig/gribex/grprs1.F
-+++ emoslib-4.3.7/gribex/grprs1.F
-@@ -949,7 +949,7 @@ C
- WRITE(GRPRSM,2115) KSEC1(56)
- WRITE(GRPRSM,2116) KSEC1(57)
- WRITE(HVERSION, '(A8)' ) KSEC1(58)
--#ifdef LITTLE_ENDIAN
-+#if !defined(WORDS_BIGENDIAN)
- WRITE(GRPRSM,2117) HVERSION(5:5)
- #else
- WRITE(GRPRSM,2117) HVERSION(8:8)
-Index: emoslib-4.3.7/Makefile.am
-===================================================================
---- /dev/null
-+++ emoslib-4.3.7/Makefile.am
-@@ -0,0 +1,20 @@
-+# Makefile for libemos
-+#
-+R64 = reals
-+TARGETS = all clean
-+LIBRARY = libemos$(R64).a
-+SHELL=/bin/sh
-+SUBDIRS = gribex interpolation bufrdc crexdc pbio fft bufrtables
-+
-+all :
-+ @for name in $(SUBDIRS); do\
-+ ( echo "*************************"; \
-+ echo "*** Make in $$name "; \
-+ echo "*************************"; \
-+ cd $$name ; make LIB=emos ; ) done
-+
-+clean :
-+ @for name in $(SUBDIRS); do\
-+ ( echo "*** Clean in $$name ***" ;cd $$name ; make clean ); \
-+ done
-+ rm -f $(LIBRARY)
-Index: emoslib-4.3.7/NEWS
-===================================================================
---- /dev/null
-+++ emoslib-4.3.7/NEWS
-@@ -0,0 +1,9 @@
-+EMOSLIB
-+
-+The routines included in the software library EMOSLIB were developed in the Meteorological Application Section at the European Centre for Medium-Range Weather Forecasts, Reading, U.K. They are used for:
-+
-+ * encoding and decoding BUFR products
-+ * encoding and decoding GRIB products
-+ * handling pure binary unix files
-+ * interpolating fields
-+ * handling files of GRIB products in an indexed manner
diff --git a/debian/patches/series b/debian/patches/series
index 5bce192..7c64a6f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,6 @@
drop_tune.patch
bufrnum.patch
pkgconfig.patch
-little_endian.patch
-# wvqlid2.patch
shared.patch
build_fixes.patch
cmake_fixes.patch
diff --git a/debian/rules b/debian/rules
index 4d4d500..8367316 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,45 +17,40 @@ CMAKE_DIR:=debian/tmp/share/libemos/cmake
DO_TEST:=true
# Do tests on little-endian only for the moment;
-DO_TEST:= true
+BIGENDIAN_LIST:= "s390x mips sparc powerpc sparc64"
+ifneq (,$(findstring $(ARCH),$(BIGENDIAN_LIST)))
+ LITTLE:= false
+else
+ LITTLE:= true
+endif
+
+FPIC_LIST:= "s390x amd64 ppc64el m68k"
+ifneq (,$(findstring $(ARCH),$(FPIC_LIST)))
+ FPIC:= -fPIC
+else
+ FPIC:= -fpic
+endif
MCMODEL_FLAGS:=''
BUILD_FLAGS:=''
-FPIC:= -fpic
-ifeq ($(ARCH), s390x)
- DO_TEST:= false
- FPIC:= -fPIC
-endif
-ifeq ($(ARCH), powerpc)
- DO_TEST:= false
-endif
-ifeq ($(ARCH), mips)
- DO_TEST:= false
-endif
ifeq ($(ARCH), amd64)
MCMODEL_FLAGS:= -mcmodel=medium
- FPIC:= -fPIC
endif
-ifeq ($(ARCH), ppc64el)
- MCMODEL_FLAGS:= -mcmodel=large
- FPIC:= -fPIC
+ifeq ($(ARCH), sparc64)
MCMODEL_FLAGS:= -mcmodel=large
endif
-ifeq ($(ARCH), sparc)
- FPIC:= -fPIC
- DO_TEST:= false
+ifeq ($(ARCH), ppc64el)
+ MCMODEL_FLAGS:= -mcmodel=large
endif
ifeq ($(ARCH), hurd-i386)
BUILD_FLAGS:= ' -D__GNU__'
endif
-ifeq ($(ARCH), m68k)
- FPIC:= -fPIC
-endif
+
override_dh_auto_test:
# Need links for tests.
(cd bufrtables && sh ./links.sh)
- $(DO_TEST) && dh_auto_test || echo "Tests disabled on bigendian systems for the moment"
+ $(LITTLE) && dh_auto_test || echo "Tests disabled on bigendian systems for the moment"
override_dh_auto_clean:
find bufrtables -type l -delete
@@ -66,6 +61,7 @@ override_dh_auto_configure:
dh_auto_configure -- \
-DECBUILD_LOG_LEVEL=DEBUG \
-DENABLE_FFTW=ON \
+ -DENABLE_LITTLE_ENDIAN=$(LITTLE) \
-DCMAKE_INSTALL_PREFIX=${DESTDIR} \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=ON \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/emos.git
More information about the debian-science-commits
mailing list