Skip to content

Commit b6147d5

Browse files
committed
upgrading gcc/gfortran/g++ fixes issue 8 with libgfortran clashes
heclib had to be recompiled with these compilers to avoid crashing
1 parent b36ef1a commit b6147d5

4 files changed

Lines changed: 6 additions & 5 deletions

File tree

conda.recipe/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ source:
1111
build:
1212
number: 0
1313
#skip: true
14-
script: LDSHARED=g++ python setup.py install --single-version-externally-managed --record=record.txt # [unix]
14+
script: python setup.py install --single-version-externally-managed --record=record.txt # [unix]
1515
script: python setup.py install --single-version-externally-managed --record=record.txt # [win]
1616

1717
requirements:
@@ -21,12 +21,12 @@ requirements:
2121
- numpy {{ numpy }}
2222
- swig
2323
- pandas >=0.23
24+
- pytest-runner >=5.0
2425

2526
run:
2627
- python >=3.7
2728
- numpy >=1.16
2829
- pandas >=0.23
29-
# - libgfortran >=3.0 # needed by linux but from channel anaconda https://github.com/CADWRDeltaModeling/pyhecdss/issues/8
3030

3131
test:
3232
imports:

extensions/libheclib6-WE.a

-15.5 KB
Binary file not shown.
-25.3 KB
Binary file not shown.

setup.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def find_version(*file_paths):
4141

4242
requirements = ["numpy>=1.16,<2","pandas>=0.23"]
4343

44-
setup_requirements = ['pytest-runner', ]
44+
setup_requirements = ['pytest-runner>=5.0', ]
4545

4646
test_requirements = ['pytest', ]
4747

@@ -51,7 +51,8 @@ def find_version(*file_paths):
5151

5252
if platform.system() == 'Linux':
5353
# 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!
54+
extra_links = ['-fno-exceptions','-fno-rtti','-shared',
55+
'-lgfortran','-lstdc++']
5556
libs = ['heclib6-WE'] # linux
5657
libdirs = ['./extensions'] # linux
5758
compile_args=['-D_GNU_SOURCE','-fno-exceptions'] # linux
@@ -69,7 +70,7 @@ def find_version(*file_paths):
6970
pyheclib_module = Extension('pyhecdss._pyheclib',
7071
sources=['pyhecdss/pyheclib.i',
7172
'pyhecdss/hecwrapper.c'],
72-
swig_opts=['-python', '-py3'],
73+
swig_opts=['-py3'],
7374
libraries=libs,
7475
library_dirs=libdirs,
7576
extra_compile_args=compile_args,

0 commit comments

Comments
 (0)