Skip to content

Commit 30453cc

Browse files
LourensVeenLourensVeen
authored
Merge pull request #1213 from LourensVeen/issue-1212-mesa-fixes
Fixes for issues 1212 and 1215
2 parents 7ab8d84 + 8aa24fe commit 30453cc

61 files changed

Lines changed: 219 additions & 1943 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎lib/sapporo_light/support/configure‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3934,11 +3934,11 @@ if test x$ac_prog_cxx_stdcxx = xno
39343934
then :
39353935
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
39363936
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
3937-
if test ${ac_cv_prog_cxx_11+y}
3937+
if test ${ac_cv_prog_cxx_cxx11+y}
39383938
then :
39393939
printf %s "(cached) " >&6
39403940
else $as_nop
3941-
ac_cv_prog_cxx_11=no
3941+
ac_cv_prog_cxx_cxx11=no
39423942
ac_save_CXX=$CXX
39433943
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
39443944
/* end confdefs.h. */
@@ -3980,11 +3980,11 @@ if test x$ac_prog_cxx_stdcxx = xno
39803980
then :
39813981
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
39823982
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
3983-
if test ${ac_cv_prog_cxx_98+y}
3983+
if test ${ac_cv_prog_cxx_cxx98+y}
39843984
then :
39853985
printf %s "(cached) " >&6
39863986
else $as_nop
3987-
ac_cv_prog_cxx_98=no
3987+
ac_cv_prog_cxx_cxx98=no
39883988
ac_save_CXX=$CXX
39893989
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
39903990
/* end confdefs.h. */

‎src/amuse_aarsethzare/support/configure‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2400,7 +2400,6 @@ then :
24002400
24012401
# Conda does not set FCFLAGS, so we copy from FFLAGS here
24022402
FCFLAGS="$FFLAGS"
2403-
LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
24042403
# Conda pkg-config includes this already, but in case we have one from
24052404
# the system...
24062405
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"

‎src/amuse_adaptb/support/configure‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2771,7 +2771,6 @@ then :
27712771

27722772
# Conda does not set FCFLAGS, so we copy from FFLAGS here
27732773
FCFLAGS="$FFLAGS"
2774-
LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
27752774
# Conda pkg-config includes this already, but in case we have one from
27762775
# the system...
27772776
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3637,11 +3636,11 @@ if test x$ac_prog_cxx_stdcxx = xno
36373636
then :
36383637
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
36393638
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
3640-
if test ${ac_cv_prog_cxx_11+y}
3639+
if test ${ac_cv_prog_cxx_cxx11+y}
36413640
then :
36423641
printf %s "(cached) " >&6
36433642
else $as_nop
3644-
ac_cv_prog_cxx_11=no
3643+
ac_cv_prog_cxx_cxx11=no
36453644
ac_save_CXX=$CXX
36463645
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
36473646
/* end confdefs.h. */
@@ -3683,11 +3682,11 @@ if test x$ac_prog_cxx_stdcxx = xno
36833682
then :
36843683
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
36853684
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
3686-
if test ${ac_cv_prog_cxx_98+y}
3685+
if test ${ac_cv_prog_cxx_cxx98+y}
36873686
then :
36883687
printf %s "(cached) " >&6
36893688
else $as_nop
3690-
ac_cv_prog_cxx_98=no
3689+
ac_cv_prog_cxx_cxx98=no
36913690
ac_save_CXX=$CXX
36923691
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
36933692
/* end confdefs.h. */

‎src/amuse_athena/support/configure‎

Lines changed: 9 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,6 @@ GUNZIP
674674
TAR
675675
DOWNLOAD
676676
CURL
677-
WGET
678677
RANLIB
679678
AR
680679
target_os
@@ -2842,7 +2841,6 @@ then :
28422841

28432842
# Conda does not set FCFLAGS, so we copy from FFLAGS here
28442843
FCFLAGS="$FFLAGS"
2845-
LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
28462844
# Conda pkg-config includes this already, but in case we have one from
28472845
# the system...
28482846
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4420,108 +4418,6 @@ fi
44204418

44214419
# Find tools to download and unpack with
44224420

4423-
if test -n "$ac_tool_prefix"; then
4424-
# Extract the first word of "${ac_tool_prefix}wget", so it can be a program name with args.
4425-
set dummy ${ac_tool_prefix}wget; ac_word=$2
4426-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4427-
printf %s "checking for $ac_word... " >&6; }
4428-
if test ${ac_cv_prog_WGET+y}
4429-
then :
4430-
printf %s "(cached) " >&6
4431-
else $as_nop
4432-
if test -n "$WGET"; then
4433-
ac_cv_prog_WGET="$WGET" # Let the user override the test.
4434-
else
4435-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4436-
for as_dir in $PATH
4437-
do
4438-
IFS=$as_save_IFS
4439-
case $as_dir in #(((
4440-
'') as_dir=./ ;;
4441-
*/) ;;
4442-
*) as_dir=$as_dir/ ;;
4443-
esac
4444-
for ac_exec_ext in '' $ac_executable_extensions; do
4445-
if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
4446-
ac_cv_prog_WGET="${ac_tool_prefix}wget"
4447-
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
4448-
break 2
4449-
fi
4450-
done
4451-
done
4452-
IFS=$as_save_IFS
4453-
4454-
fi
4455-
fi
4456-
WGET=$ac_cv_prog_WGET
4457-
if test -n "$WGET"; then
4458-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
4459-
printf "%s\n" "$WGET" >&6; }
4460-
else
4461-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
4462-
printf "%s\n" "no" >&6; }
4463-
fi
4464-
4465-
4466-
fi
4467-
if test -z "$ac_cv_prog_WGET"; then
4468-
ac_ct_WGET=$WGET
4469-
# Extract the first word of "wget", so it can be a program name with args.
4470-
set dummy wget; ac_word=$2
4471-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4472-
printf %s "checking for $ac_word... " >&6; }
4473-
if test ${ac_cv_prog_ac_ct_WGET+y}
4474-
then :
4475-
printf %s "(cached) " >&6
4476-
else $as_nop
4477-
if test -n "$ac_ct_WGET"; then
4478-
ac_cv_prog_ac_ct_WGET="$ac_ct_WGET" # Let the user override the test.
4479-
else
4480-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4481-
for as_dir in $PATH
4482-
do
4483-
IFS=$as_save_IFS
4484-
case $as_dir in #(((
4485-
'') as_dir=./ ;;
4486-
*/) ;;
4487-
*) as_dir=$as_dir/ ;;
4488-
esac
4489-
for ac_exec_ext in '' $ac_executable_extensions; do
4490-
if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
4491-
ac_cv_prog_ac_ct_WGET="wget"
4492-
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
4493-
break 2
4494-
fi
4495-
done
4496-
done
4497-
IFS=$as_save_IFS
4498-
4499-
fi
4500-
fi
4501-
ac_ct_WGET=$ac_cv_prog_ac_ct_WGET
4502-
if test -n "$ac_ct_WGET"; then
4503-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WGET" >&5
4504-
printf "%s\n" "$ac_ct_WGET" >&6; }
4505-
else
4506-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
4507-
printf "%s\n" "no" >&6; }
4508-
fi
4509-
4510-
if test "x$ac_ct_WGET" = x; then
4511-
WGET=""
4512-
else
4513-
case $cross_compiling:$ac_tool_warned in
4514-
yes:)
4515-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4516-
printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4517-
ac_tool_warned=yes ;;
4518-
esac
4519-
WGET=$ac_ct_WGET
4520-
fi
4521-
else
4522-
WGET="$ac_cv_prog_WGET"
4523-
fi
4524-
45254421
if test -n "$ac_tool_prefix"; then
45264422
# Extract the first word of "${ac_tool_prefix}curl", so it can be a program name with args.
45274423
set dummy ${ac_tool_prefix}curl; ac_word=$2
@@ -4625,24 +4521,16 @@ else
46254521
fi
46264522

46274523

4628-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a wget or curl to download files with" >&5
4629-
printf %s "checking for a wget or curl to download files with... " >&6; }
4630-
if test "x$WGET" != "x"
4524+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a tool to download files with" >&5
4525+
printf %s "checking for a tool to download files with... " >&6; }
4526+
if test "x$CURL" != "x"
46314527
then
4632-
# The MESA SDK server rejects wget, this is the official work-around
4633-
DOWNLOAD="$WGET --progress=bar:force:noscroll --user-agent='' -O -"
4528+
DOWNLOAD="$CURL -L"
46344529
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
46354530
printf "%s\n" "yes" >&6; }
46364531
else
4637-
if test "x$CURL" != "x"
4638-
then
4639-
DOWNLOAD="$CURL -L"
4640-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4641-
printf "%s\n" "yes" >&6; }
4642-
else
4643-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
4532+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
46444533
printf "%s\n" "no" >&6; }
4645-
fi
46464534
fi
46474535

46484536

@@ -6315,11 +6203,11 @@ if test x$ac_prog_cxx_stdcxx = xno
63156203
then :
63166204
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
63176205
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
6318-
if test ${ac_cv_prog_cxx_11+y}
6206+
if test ${ac_cv_prog_cxx_cxx11+y}
63196207
then :
63206208
printf %s "(cached) " >&6
63216209
else $as_nop
6322-
ac_cv_prog_cxx_11=no
6210+
ac_cv_prog_cxx_cxx11=no
63236211
ac_save_CXX=$CXX
63246212
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
63256213
/* end confdefs.h. */
@@ -6361,11 +6249,11 @@ if test x$ac_prog_cxx_stdcxx = xno
63616249
then :
63626250
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
63636251
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
6364-
if test ${ac_cv_prog_cxx_98+y}
6252+
if test ${ac_cv_prog_cxx_cxx98+y}
63656253
then :
63666254
printf %s "(cached) " >&6
63676255
else $as_nop
6368-
ac_cv_prog_cxx_98=no
6256+
ac_cv_prog_cxx_cxx98=no
63696257
ac_save_CXX=$CXX
63706258
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
63716259
/* end confdefs.h. */

‎src/amuse_bhtree/support/configure‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2749,7 +2749,6 @@ then :
27492749

27502750
# Conda does not set FCFLAGS, so we copy from FFLAGS here
27512751
FCFLAGS="$FFLAGS"
2752-
LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
27532752
# Conda pkg-config includes this already, but in case we have one from
27542753
# the system...
27552754
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4357,11 +4356,11 @@ if test x$ac_prog_cxx_stdcxx = xno
43574356
then :
43584357
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
43594358
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
4360-
if test ${ac_cv_prog_cxx_11+y}
4359+
if test ${ac_cv_prog_cxx_cxx11+y}
43614360
then :
43624361
printf %s "(cached) " >&6
43634362
else $as_nop
4364-
ac_cv_prog_cxx_11=no
4363+
ac_cv_prog_cxx_cxx11=no
43654364
ac_save_CXX=$CXX
43664365
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
43674366
/* end confdefs.h. */
@@ -4403,11 +4402,11 @@ if test x$ac_prog_cxx_stdcxx = xno
44034402
then :
44044403
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
44054404
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
4406-
if test ${ac_cv_prog_cxx_98+y}
4405+
if test ${ac_cv_prog_cxx_cxx98+y}
44074406
then :
44084407
printf %s "(cached) " >&6
44094408
else $as_nop
4410-
ac_cv_prog_cxx_98=no
4409+
ac_cv_prog_cxx_cxx98=no
44114410
ac_save_CXX=$CXX
44124411
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
44134412
/* end confdefs.h. */

‎src/amuse_brutus/support/configure‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2871,7 +2871,6 @@ then :
28712871

28722872
# Conda does not set FCFLAGS, so we copy from FFLAGS here
28732873
FCFLAGS="$FFLAGS"
2874-
LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
28752874
# Conda pkg-config includes this already, but in case we have one from
28762875
# the system...
28772876
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -4477,11 +4476,11 @@ if test x$ac_prog_cxx_stdcxx = xno
44774476
then :
44784477
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
44794478
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
4480-
if test ${ac_cv_prog_cxx_11+y}
4479+
if test ${ac_cv_prog_cxx_cxx11+y}
44814480
then :
44824481
printf %s "(cached) " >&6
44834482
else $as_nop
4484-
ac_cv_prog_cxx_11=no
4483+
ac_cv_prog_cxx_cxx11=no
44854484
ac_save_CXX=$CXX
44864485
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
44874486
/* end confdefs.h. */
@@ -4523,11 +4522,11 @@ if test x$ac_prog_cxx_stdcxx = xno
45234522
then :
45244523
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
45254524
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
4526-
if test ${ac_cv_prog_cxx_98+y}
4525+
if test ${ac_cv_prog_cxx_cxx98+y}
45274526
then :
45284527
printf %s "(cached) " >&6
45294528
else $as_nop
4530-
ac_cv_prog_cxx_98=no
4529+
ac_cv_prog_cxx_cxx98=no
45314530
ac_save_CXX=$CXX
45324531
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
45334532
/* end confdefs.h. */

‎src/amuse_bse/support/configure‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2387,7 +2387,6 @@ then :
23872387
23882388
# Conda does not set FCFLAGS, so we copy from FFLAGS here
23892389
FCFLAGS="$FFLAGS"
2390-
LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
23912390
# Conda pkg-config includes this already, but in case we have one from
23922391
# the system...
23932392
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"

‎src/amuse_capreole/support/configure‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2403,7 +2403,6 @@ then :
24032403
24042404
# Conda does not set FCFLAGS, so we copy from FFLAGS here
24052405
FCFLAGS="$FFLAGS"
2406-
LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
24072406
# Conda pkg-config includes this already, but in case we have one from
24082407
# the system...
24092408
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"

‎src/amuse_etics/support/configure‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2752,7 +2752,6 @@ then :
27522752

27532753
# Conda does not set FCFLAGS, so we copy from FFLAGS here
27542754
FCFLAGS="$FFLAGS"
2755-
LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
27562755
# Conda pkg-config includes this already, but in case we have one from
27572756
# the system...
27582757
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"
@@ -3618,11 +3617,11 @@ if test x$ac_prog_cxx_stdcxx = xno
36183617
then :
36193618
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
36203619
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
3621-
if test ${ac_cv_prog_cxx_11+y}
3620+
if test ${ac_cv_prog_cxx_cxx11+y}
36223621
then :
36233622
printf %s "(cached) " >&6
36243623
else $as_nop
3625-
ac_cv_prog_cxx_11=no
3624+
ac_cv_prog_cxx_cxx11=no
36263625
ac_save_CXX=$CXX
36273626
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
36283627
/* end confdefs.h. */
@@ -3664,11 +3663,11 @@ if test x$ac_prog_cxx_stdcxx = xno
36643663
then :
36653664
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
36663665
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
3667-
if test ${ac_cv_prog_cxx_98+y}
3666+
if test ${ac_cv_prog_cxx_cxx98+y}
36683667
then :
36693668
printf %s "(cached) " >&6
36703669
else $as_nop
3671-
ac_cv_prog_cxx_98=no
3670+
ac_cv_prog_cxx_cxx98=no
36723671
ac_save_CXX=$CXX
36733672
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
36743673
/* end confdefs.h. */

‎src/amuse_evtwin/support/configure‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2390,7 +2390,6 @@ then :
23902390
23912391
# Conda does not set FCFLAGS, so we copy from FFLAGS here
23922392
FCFLAGS="$FFLAGS"
2393-
LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
23942393
# Conda pkg-config includes this already, but in case we have one from
23952394
# the system...
23962395
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"

0 commit comments

Comments
 (0)