Changeset 12129

Timestamp:

04/25/12 10:02:43 (13 years ago)

Author:

glperez

Message:

Minor modification to Triangle.c python patch and the arm-linux configuration script.

Location:

issm/trunk-jpl

Files:

• configs/config-arm-linux.sh (moved) (moved from issm/trunk-jpl/configs/config-arm.sh ) (1 diff)
• externalpackages/triangle/triangle.c.patch.python (modified) (1 diff)

issm/trunk-jpl/configs/config-arm-linux.sh

@@ -8 +8 @@
         --with-python-version=$pythonversion \
         --with-python-numpy-dir=$ISSM_TIER/externalpackages/python/install/Python.framework/Versions/$pythonversion/lib/python$pythonversion/site-packages/numpy/core/include/numpy\
-        --with-vendor=arm \
+        --with-vendor=arm-linux\
         --with-triangle-dir=$ISSM_TIER/externalpackages/triangle/install \
         --with-gsl-dir=$ISSM_TIER/externalpackages/gsl/install

issm/trunk-jpl/externalpackages/triangle/triangle.c.patch.python

@@ -5 +5 @@
 >  * double precision activation in exactinit(); The rest is not changed. 
 >  * We also created the ice_makefile to compile Triangle into a library. */
-> #include <mat.h>
-> #include <matrix.h>
+> /* #include <mat.h>
+> #include <matrix.h> */
 > #define ANSI_DECLARATORS
 > #define NO_TIMER