From fe5e11faed6241aacf7220436088789287507494 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 8 Feb 2025 16:28:50 +0000
Subject: [PATCH] stdenv, cmake: drop `--oldincludedir`

Without the change the build of upcoming `sqlite-3.49.0` will fail as:

    > Error: Unknown option --oldincludedir
    > Try: 'configure --help' for options

Looking at https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
it feels like it's something that predates gcc and
it should be an alias to `--includedir=`.

Let's just drop the setting of `--oldincludedir=`
(and `cmake` equivalent).
---
 pkgs/build-support/setup-hooks/multiple-outputs.sh | 2 +-
 pkgs/by-name/cm/cmake/setup-hook.sh                | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index 45096d833b42..cc3ab4816fa2 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -85,7 +85,7 @@ _multioutConfig() {
 
     prependToVar configureFlags \
         --bindir="${!outputBin}"/bin --sbindir="${!outputBin}"/sbin \
-        --includedir="${!outputInclude}"/include --oldincludedir="${!outputInclude}"/include \
+        --includedir="${!outputInclude}"/include \
         --mandir="${!outputMan}"/share/man --infodir="${!outputInfo}"/share/info \
         --docdir="${!outputDoc}"/share/doc/"${shareDocName}" \
         --libdir="${!outputLib}"/lib --libexecdir="${!outputLib}"/libexec \
diff --git a/pkgs/by-name/cm/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh
index 3df8b9bd986b..f9db8f0919ac 100755
--- a/pkgs/by-name/cm/cmake/setup-hook.sh
+++ b/pkgs/by-name/cm/cmake/setup-hook.sh
@@ -93,7 +93,6 @@ cmakeConfigurePhase() {
     prependToVar cmakeFlags "-DCMAKE_INSTALL_BINDIR=${!outputBin}/bin"
     prependToVar cmakeFlags "-DCMAKE_INSTALL_SBINDIR=${!outputBin}/sbin"
     prependToVar cmakeFlags "-DCMAKE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
-    prependToVar cmakeFlags "-DCMAKE_INSTALL_OLDINCLUDEDIR=${!outputInclude}/include"
     prependToVar cmakeFlags "-DCMAKE_INSTALL_MANDIR=${!outputMan}/share/man"
     prependToVar cmakeFlags "-DCMAKE_INSTALL_INFODIR=${!outputInfo}/share/info"
     prependToVar cmakeFlags "-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName}"