Skip to content

Commit b36ef1a

Browse files
committed
recompiled heclib (-WE) instead of (-VE) precompiled
different version of linux as source for old -VE not available precompiled version was linked with much older glibc libraries and was causing issues on deployment
1 parent a8b152d commit b36ef1a

6 files changed

Lines changed: 6 additions & 3 deletions

File tree

CHANGELOG.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Partial fixes for offset: Fixed for INST-* timeseries but not PER-* timeseries (
99
-----
1010
Performance tests added to showcase pyhecdss is the fastest
1111
Fixed issue #10: Period data stored shifted to end of time stamp (HEC-DSS convention)
12-
Fixed issue #9: Check for missing directories before opening DSS file (avoids crashes)
12+
Fixing libgfortran dependency on linux by statically linking the library
1313

1414
0.2.5
1515
-----

conda.recipe/meta.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ requirements:
2121
- numpy {{ numpy }}
2222
- swig
2323
- pandas >=0.23
24+
2425
run:
2526
- python >=3.7
2627
- numpy >=1.16
2728
- pandas >=0.23
29+
# - libgfortran >=3.0 # needed by linux but from channel anaconda https://github.com/CADWRDeltaModeling/pyhecdss/issues/8
2830

2931
test:
3032
imports:

extensions/libheclib6-VE.a

-1.92 MB
Binary file not shown.

extensions/libheclib6-WE.a

1.92 MB
Binary file not shown.
-7.84 KB
Binary file not shown.

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ def find_version(*file_paths):
5050
import platform
5151

5252
if platform.system() == 'Linux':
53-
extra_links = ['-fno-exceptions','-lgfortran','-shared'] # linux
54-
libs = ['heclib6-VE'] # linux
53+
# https://stackoverflow.com/questions/329059/what-is-gxx-personality-v0-for
54+
extra_links = ['-fno-exceptions','-fno-rtti','-shared','-lgfortran','-lstdc++'] # linux -static-libgcc -static-libstdc++ -static-libgfortran not working!
55+
libs = ['heclib6-WE'] # linux
5556
libdirs = ['./extensions'] # linux
5657
compile_args=['-D_GNU_SOURCE','-fno-exceptions'] # linux
5758
elif platform.system() == 'Windows':

0 commit comments

Comments
 (0)