sagemathgh-38087: Still add rpath to our own libstdc++, in case we bu…

…ilt our own toolchain The GMP configure test should link against our own libstdc++ instead of the (too old) system libstdc++ Fixes sagemath#38085 URL: sagemath#38087 Reported by: Volker Braun Reviewer(s):
vbraun · May 26, 2024 · edcfce6 · edcfce6
2 parents 646c25c + 2a4e9df
commit edcfce6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
@@ -1,3 +1,3 @@
 tarball=configure-VERSION.tar.gz
-sha1=605eb62e991cc1216d9590f2de779b00c4b7c98a
-sha256=b1cc158f4a15f8d0aebf9253b706a1b0797561ed27f30cce725ec5e216dd004e
+sha1=f4efd6a00448f5dba088b13d62c2641e65c195e7
+sha256=d4731cc6c98ecb2f64a40b540ff7b95d78680362f3ff66cba704e148dc80a79c
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-266b7569daa9d9be93e06f83e5d1eda01536f0bd
+c2183f88a4a2ed7b3b118a9ba131addb9821b06c
diff --git a/build/pkgs/gmp/spkg-install.in b/build/pkgs/gmp/spkg-install.in
@@ -101,7 +101,10 @@ fi
 
 # Pre-configure GMP to get the settings it would use if CFLAGS were empty:
 echo "Checking what CFLAGS GMP would use if they were empty..."
-(unset CFLAGS CPPFLAGS CXXFLAGS && ./configure $GMP_CONFIGURE) &>configure-empty.log
+(
+    unset CFLAGS CPPFLAGS CXXFLAGS &&
+    CXXFLAGS="-Wl,-rpath -Wl,$SAGE_LOCAL/lib" ./configure $GMP_CONFIGURE
+) &>configure-empty.log
 if [ $? -ne 0 ]; then
     # Output the log of the failed configure run
     cat configure-empty.log