From 17a9da0402096881a6fc7b5735a282900a98e7e9 Mon Sep 17 00:00:00 2001 From: Bryan Kowal Date: Wed, 1 Aug 2012 11:49:02 -0500 Subject: [PATCH] Issue #970 - ensure that g2int has the same definition throughout grib2 and all dependencies; updated variable types based on function signatures. Change-Id: If25d724c18ff5a9d09f94d77304ec729866158e6 Former-commit-id: dd451f392fd7f64f0c0196b63e791866072f21c1 [formerly 6126e4316a412a3e333194fe7aac14a7d1376337] [formerly 485334331a8b71c24eec92f7700ffe6c29832466] [formerly d07281ac51e6c9ecc564d1af9145a60cbd96f2eb [formerly 485334331a8b71c24eec92f7700ffe6c29832466 [formerly 4dc6be0e1bf32b126a0685109131e1b4b3f5acd1]]] Former-commit-id: d07281ac51e6c9ecc564d1af9145a60cbd96f2eb Former-commit-id: f8fef4627ebba88a297740ab1ae189fd855e752d [formerly 024a23e7a301604f717c7c8a6f7466f18e3c52c0] Former-commit-id: 5b7330ca01d5392b8b874289258fb1266a3c56fe --- nativeLib/.project | 11 ----------- nativeLib/build.native/makefile.arch | 17 ++++++++++++++++- nativeLib/ncep_grib2module/.cproject | 2 +- .../dependencies/src/g2clib-1.1.8/makefile | 3 +++ nativeLib/ncep_grib2module/src/grib2module.c | 9 +++++++-- .../Installer.python/component.spec | 2 +- .../Installer.python/nativeLib/i386/grib2.so | Bin 250184 -> 250452 bytes .../nativeLib/x86_64/grib2.so | Bin 306783 -> 258855 bytes 8 files changed, 28 insertions(+), 16 deletions(-) delete mode 100644 nativeLib/.project diff --git a/nativeLib/.project b/nativeLib/.project deleted file mode 100644 index 113b488e81..0000000000 --- a/nativeLib/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - nativeLib - - - - - - - - diff --git a/nativeLib/build.native/makefile.arch b/nativeLib/build.native/makefile.arch index 07dae8b8f6..da3d33d748 100644 --- a/nativeLib/build.native/makefile.arch +++ b/nativeLib/build.native/makefile.arch @@ -1,12 +1,27 @@ -ARCHFLAGS = +# This script will currently only influence how various cdt +# project dependencies are built rather than the cdt builds +# themselves. + +# leave blank to let the OS determine the architecture or +# set to one of: {-m32, -m64} to specify the architecture. +# setting the flag to anything other than -m32 or -m64 will +# cause unknown, potentially chaotic, build results. +ARCHFLAGS = -m32 + +# ARCHFLAGS is set into the build environment so that scripts +# that utilize this script can execute their own architecture +# specific steps. ifndef ARCHFLAGS ARCH ?= $(shell uname -i) ifeq ($(ARCH),x86_64) export CFLAGS := $(CFLAGS) -m64 + export ARCHFLAGS := -m64 else export CFLAGS := $(CFLAGS) -m32 + export ARCHFLAGS := -m32 endif else export CFLAGS := $(CFLAGS) $(ARCHFLAGS) + export ARCHFLAGS := $(ARCHFLAGS) endif \ No newline at end of file diff --git a/nativeLib/ncep_grib2module/.cproject b/nativeLib/ncep_grib2module/.cproject index 5fb6b8c498..edcdb86632 100644 --- a/nativeLib/ncep_grib2module/.cproject +++ b/nativeLib/ncep_grib2module/.cproject @@ -45,7 +45,7 @@