fix for recent clang

This commit is contained in:
edoapra 2022-12-21 10:03:12 -08:00
parent 3969c5c9c5
commit 249971f999
No known key found for this signature in database
GPG key ID: 48E12DA1EDE9E1B0
2 changed files with 23 additions and 13 deletions

View file

@ -203,6 +203,7 @@ GOTMINGW64=` $CC -dM -E - </dev/null 2> /dev/null |grep MINGW64|cut -c21 `
if [[ -d "ga-5.8.2" ]]; then
if [[ ! -f "ga-5.8.2/patched581" ]]; then
./gamalloc_patch.sh $GA_DIR
./peigstubs_patch.sh $GA_DIR
echo patched
touch ga-5.8.2/patched581
fi
@ -215,19 +216,6 @@ fi
#./msmpi_patch.sh $GA_DIR
#./mingw64_patch.sh $GA_DIR
#fi
#if [[ -d "ga-5.8.2" ]]; then
# if [[ ! -f "ga-5.8.2/patched581" ]]; then
# ./strdup_patch.sh $GA_DIR
# ./nodelist_patch.sh $GA_DIR
# ./nompif_patch.sh $GA_DIR
# ./ptstride_patch.sh $GA_DIR
# ./pt.sh $GA_DIR
# patch -p0 -s -N < ./fujitsu.patch
# patch -p0 -s -N < ./dra_f2c.patch
# echo patched
# touch ga-5.8.2/patched581
# fi
#fi
#patch -p0 -s -N < ./scala1.patch
if test -e $GA_DIR/configure

22
src/tools/peigstubs_patch.sh Executable file
View file

@ -0,0 +1,22 @@
#!/usr/bin/env bash
rm -f peigstubs.patch
cat > peigstubs.patch <<EOF
--- $1/global/src/peigstubs.c
+++ $1/global/src/peigstubs.c
@@ -11,9 +11,9 @@
# define gai_diag_ F77_FUNC_(gai_diag,GAI_DIAG)
# define gai_diag_std_ F77_FUNC_(gai_diag_std,GAI_DIAG_STD)
# define gai_diag_reuse_ F77_FUNC_(gai_diag_reuse,GAI_DIAG_REUSE)
-extern gai_diag_(Integer*,Integer*,Integer*,DoublePrecision*);
-extern gai_diag_std_(Integer*,Integer*,DoublePrecision*);
-extern gai_diag_reuse_(Integer*,Integer*,Integer*,Integer*,DoublePrecision*);
+extern void gai_diag_(Integer*,Integer*,Integer*,DoublePrecision*);
+extern void gai_diag_std_(Integer*,Integer*,DoublePrecision*);
+extern void gai_diag_reuse_(Integer*,Integer*,Integer*,Integer*,DoublePrecision*);
# else
# endif
#else
EOF
patch -p0 -s -N < peigstubs.patch
echo strdup.patch applied