# HG changeset patch # User Markus Mützel # Date 1611489786 -3600 # Sun Jan 24 13:03:06 2021 +0100 # Node ID 7fb6b2c98732e21c3052eb50561e2403e486d665 # Parent 7bb6a7cbb65eca63dfeb7028112c0e0ee0880665 build: Support double quoted paths in configure variables (bug #59923). * build-aux/subst-config-vals.in.h, build-aux/subst-cross-config-vals.in.h: Use single quotes to allow for double quoted paths in configure variables. Replace double quotes by double escaped double quotes. diff -r 7bb6a7cbb65e -r 7fb6b2c98732 build-aux/subst-config-vals.in.sh --- a/build-aux/subst-config-vals.in.sh Sat Jan 23 17:28:14 2021 +0100 +++ b/build-aux/subst-config-vals.in.sh Sun Jan 24 13:03:06 2021 +0100 @@ -38,52 +38,53 @@ prefix="@prefix@" exec_prefix="@exec_prefix@" -archlibdir=`echo "@archlibdir@" | sed "s|^${exec_prefix}/\\+||"` -bindir=`echo "@bindir@" | sed "s|^${exec_prefix}/\\+||"` -libdir=`echo "@libdir@" | sed "s|^${exec_prefix}/\\+||"` -libexecdir=`echo "@libexecdir@" | sed "s|^${exec_prefix}/\\+||"` -localapiarchlibdir=`echo "@localapiarchlibdir@" | sed "s|^${exec_prefix}/\\+||"` -localapioctfiledir=`echo "@localapioctfiledir@" | sed "s|^${exec_prefix}/\\+||"` -localarchlibdir=`echo "@localarchlibdir@" | sed "s|^${exec_prefix}/\\+||"` -localoctfiledir=`echo "@localoctfiledir@" | sed "s|^${exec_prefix}/\\+||"` -localverarchlibdir=`echo "@localverarchlibdir@" | sed "s|^${exec_prefix}/\\+||"` -localveroctfiledir=`echo "@localveroctfiledir@" | sed "s|^${exec_prefix}/\\+||"` -octfiledir=`echo "@octfiledir@" | sed "s|^${exec_prefix}/\\+||"` -octlibdir=`echo "@octlibdir@" | sed "s|^${exec_prefix}/\\+||"` +archlibdir=`echo '@archlibdir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +bindir=`echo '@bindir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +libdir=`echo '@libdir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +libexecdir=`echo '@libexecdir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localapiarchlibdir=`echo '@localapiarchlibdir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localapioctfiledir=`echo '@localapioctfiledir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localarchlibdir=`echo '@localarchlibdir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localoctfiledir=`echo '@localoctfiledir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localverarchlibdir=`echo '@localverarchlibdir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localveroctfiledir=`echo '@localveroctfiledir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +octfiledir=`echo '@octfiledir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +octlibdir=`echo '@octlibdir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` -datadir=`echo "@datadir@" | sed "s|^${prefix}/\\+||"` -datarootdir=`echo "@datarootdir@" | sed "s|^${prefix}/\\+||"` -doc_cache_file=`echo "@doc_cache_file@" | sed "s|^${prefix}/\\+||"` -exec_prefix=`echo "@exec_prefix@" | sed "s|^${prefix}/\\+||"` -fcnfiledir=`echo "@fcnfiledir@" | sed "s|^${prefix}/\\+||"` -imagedir=`echo "@imagedir@" | sed "s|^${prefix}/\\+||"` -includedir=`echo "@includedir@" | sed "s|^${prefix}/\\+||"` -infodir=`echo "@infodir@" | sed "s|^${prefix}/\\+||"` -infofile=`echo "@infofile@" | sed "s|^${prefix}/\\+||"` -localapifcnfiledir=`echo "@localapifcnfiledir@" | sed "s|^${prefix}/\\+||"` -localfcnfiledir=`echo "@localfcnfiledir@" | sed "s|^${prefix}/\\+||"` -localstartupfiledir=`echo "@localstartupfiledir@" | sed "s|^${prefix}/\\+||"` -localapiarchlibdir=`echo "@localapiarchlibdir@" | sed "s|^${prefix}/\\+||"` -localverfcnfiledir=`echo "@localverfcnfiledir@" | sed "s|^${prefix}/\\+||"` -man1dir=`echo "@man1dir@" | sed "s|^${prefix}/\\+||"` -mandir=`echo "@mandir@" | sed "s|^${prefix}/\\+||"` -octdatadir=`echo "@octdatadir@" | sed "s|^${prefix}/\\+||"` -octdocdir=`echo "@octdocdir@" | sed "s|^${prefix}/\\+||"` -octetcdir=`echo "@octetcdir@" | sed "s|^${prefix}/\\+||"` -octfontsdir=`echo "@octfontsdir@" | sed "s|^${prefix}/\\+||"` -octincludedir=`echo "@octincludedir@" | sed "s|^${prefix}/\\+||"` -octlocaledir=`echo "@octlocaledir@" | sed "s|^${prefix}/\\+||"` -octtestsdir=`echo "@octtestsdir@" | sed "s|^${prefix}/\\+||"` -startupfiledir=`echo "@startupfiledir@" | sed "s|^${prefix}/\\+||"` -texi_macros_file=`echo "@texi_macros_file@" | sed "s|^${prefix}/\\+||"` +datadir=`echo '@datadir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +datarootdir=`echo '@datarootdir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +doc_cache_file=`echo '@doc_cache_file@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +exec_prefix=`echo '@exec_prefix@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +fcnfiledir=`echo '@fcnfiledir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +imagedir=`echo '@imagedir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +includedir=`echo '@includedir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +infodir=`echo '@infodir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +infofile=`echo '@infofile@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localapifcnfiledir=`echo '@localapifcnfiledir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localfcnfiledir=`echo '@localfcnfiledir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localstartupfiledir=`echo '@localstartupfiledir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localapiarchlibdir=`echo '@localapiarchlibdir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localverfcnfiledir=`echo '@localverfcnfiledir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +man1dir=`echo '@man1dir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +mandir=`echo '@mandir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +octdatadir=`echo '@octdatadir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +octdocdir=`echo '@octdocdir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +octetcdir=`echo '@octetcdir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +octfontsdir=`echo '@octfontsdir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +octincludedir=`echo '@octincludedir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +octlocaledir=`echo '@octlocaledir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +octtestsdir=`echo '@octtestsdir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +startupfiledir=`echo '@startupfiledir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +texi_macros_file=`echo '@texi_macros_file@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` ## Replace portions of compiler flags that depend on prefix on target -cppflags=`echo "@CPPFLAGS@" | sed "s|@prefix@|\$\{prefix\}|g"` -fftw3f_ldflags=`echo "@FFTW3F_LDFLAGS@" | sed "s|@prefix@|\$\{prefix\}|g"` -fftw3_ldflags=`echo "@FFTW3_LDFLAGS@" | sed "s|@prefix@|\$\{prefix\}|g"` -flibs=`echo "@FLIBS@" | sed "s|@prefix@|\$\{prefix\}|g"` -ldflags=`echo "@LDFLAGS@" | sed "s|@prefix@|\$\{prefix\}|g"` -oct_link_opts=`echo "@OCT_LINK_OPTS@" | sed "s|@prefix@|\$\{prefix\}|g"` +cppflags=`echo '@CPPFLAGS@' | sed "s|@prefix@|\$\{prefix\}|g" | sed 's|\"|\\\\\\\"|g'` +fftw3f_ldflags=`echo '@FFTW3F_LDFLAGS@' | sed "s|@prefix@|\$\{prefix\}|g" | sed 's|\"|\\\\\\\"|g'` +fftw3_ldflags=`echo '@FFTW3_LDFLAGS@' | sed "s|@prefix@|\$\{prefix\}|g" | sed 's|\"|\\\\\\\"|g'` +flibs=`echo '@FLIBS@' | sed "s|@prefix@|\$\{prefix\}|g" | sed 's|\"|\\\\\\\"|g'` +ldflags=`echo '@LDFLAGS@' | sed "s|@prefix@|\$\{prefix\}|g" | sed 's|\"|\\\\\\\"|g'` +oct_link_opts=`echo '@OCT_LINK_OPTS@' | sed "s|@prefix@|\$\{prefix\}|g" | sed 's|\"|\\\\\\\"|g'` + srcdir="@srcdir@" top_srcdir="@top_srcdir@" diff -r 7bb6a7cbb65e -r 7fb6b2c98732 build-aux/subst-cross-config-vals.in.sh --- a/build-aux/subst-cross-config-vals.in.sh Sat Jan 23 17:28:14 2021 +0100 +++ b/build-aux/subst-cross-config-vals.in.sh Sun Jan 24 13:03:06 2021 +0100 @@ -48,52 +48,52 @@ prefix="@prefix@" exec_prefix="@exec_prefix@" -archlibdir=`echo "@archlibdir@" | sed "s|^${exec_prefix}/\\+||"` -bindir=`echo "@bindir@" | sed "s|^${exec_prefix}/\\+||"` -libdir=`echo "@libdir@" | sed "s|^${exec_prefix}/\\+||"` -libexecdir=`echo "@libexecdir@" | sed "s|^${exec_prefix}/\\+||"` -localapiarchlibdir=`echo "@localapiarchlibdir@" | sed "s|^${exec_prefix}/\\+||"` -localapioctfiledir=`echo "@localapioctfiledir@" | sed "s|^${exec_prefix}/\\+||"` -localarchlibdir=`echo "@localarchlibdir@" | sed "s|^${exec_prefix}/\\+||"` -localoctfiledir=`echo "@localoctfiledir@" | sed "s|^${exec_prefix}/\\+||"` -localverarchlibdir=`echo "@localverarchlibdir@" | sed "s|^${exec_prefix}/\\+||"` -localveroctfiledir=`echo "@localveroctfiledir@" | sed "s|^${exec_prefix}/\\+||"` -octfiledir=`echo "@octfiledir@" | sed "s|^${exec_prefix}/\\+||"` -octlibdir=`echo "@octlibdir@" | sed "s|^${exec_prefix}/\\+||"` +archlibdir=`echo '@archlibdir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +bindir=`echo '@bindir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +libdir=`echo '@libdir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +libexecdir=`echo '@libexecdir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localapiarchlibdir=`echo '@localapiarchlibdir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localapioctfiledir=`echo '@localapioctfiledir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localarchlibdir=`echo '@localarchlibdir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localoctfiledir=`echo '@localoctfiledir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localverarchlibdir=`echo '@localverarchlibdir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localveroctfiledir=`echo '@localveroctfiledir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +octfiledir=`echo '@octfiledir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +octlibdir=`echo '@octlibdir@' | sed "s|^${exec_prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` -datadir=`echo "@datadir@" | sed "s|^${prefix}/\\+||"` -datarootdir=`echo "@datarootdir@" | sed "s|^${prefix}/\\+||"` -doc_cache_file=`echo "@doc_cache_file@" | sed "s|^${prefix}/\\+||"` -exec_prefix=`echo "@exec_prefix@" | sed "s|^${prefix}/\\+||"` -fcnfiledir=`echo "@fcnfiledir@" | sed "s|^${prefix}/\\+||"` -imagedir=`echo "@imagedir@" | sed "s|^${prefix}/\\+||"` -includedir=`echo "@includedir@" | sed "s|^${prefix}/\\+||"` -infodir=`echo "@infodir@" | sed "s|^${prefix}/\\+||"` -infofile=`echo "@infofile@" | sed "s|^${prefix}/\\+||"` -localapifcnfiledir=`echo "@localapifcnfiledir@" | sed "s|^${prefix}/\\+||"` -localfcnfiledir=`echo "@localfcnfiledir@" | sed "s|^${prefix}/\\+||"` -localstartupfiledir=`echo "@localstartupfiledir@" | sed "s|^${prefix}/\\+||"` -localapiarchlibdir=`echo "@localapiarchlibdir@" | sed "s|^${prefix}/\\+||"` -localverfcnfiledir=`echo "@localverfcnfiledir@" | sed "s|^${prefix}/\\+||"` -man1dir=`echo "@man1dir@" | sed "s|^${prefix}/\\+||"` -mandir=`echo "@mandir@" | sed "s|^${prefix}/\\+||"` -octdatadir=`echo "@octdatadir@" | sed "s|^${prefix}/\\+||"` -octdocdir=`echo "@octdocdir@" | sed "s|^${prefix}/\\+||"` -octetcdir=`echo "@octetcdir@" | sed "s|^${prefix}/\\+||"` -octfontsdir=`echo "@octfontsdir@" | sed "s|^${prefix}/\\+||"` -octincludedir=`echo "@octincludedir@" | sed "s|^${prefix}/\\+||"` -octlocaledir=`echo "@octlocaledir@" | sed "s|^${prefix}/\\+||"` -octtestsdir=`echo "@octtestsdir@" | sed "s|^${prefix}/\\+||"` -startupfiledir=`echo "@startupfiledir@" | sed "s|^${prefix}/\\+||"` -texi_macros_file=`echo "@texi_macros_file@" | sed "s|^${prefix}/\\+||"` +datadir=`echo '@datadir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +datarootdir=`echo '@datarootdir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +doc_cache_file=`echo '@doc_cache_file@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +exec_prefix=`echo '@exec_prefix@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +fcnfiledir=`echo '@fcnfiledir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +imagedir=`echo '@imagedir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +includedir=`echo '@includedir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +infodir=`echo '@infodir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +infofile=`echo '@infofile@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localapifcnfiledir=`echo '@localapifcnfiledir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localfcnfiledir=`echo '@localfcnfiledir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localstartupfiledir=`echo '@localstartupfiledir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localapiarchlibdir=`echo '@localapiarchlibdir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +localverfcnfiledir=`echo '@localverfcnfiledir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +man1dir=`echo '@man1dir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +mandir=`echo '@mandir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +octdatadir=`echo '@octdatadir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +octdocdir=`echo '@octdocdir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +octetcdir=`echo '@octetcdir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +octfontsdir=`echo '@octfontsdir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +octincludedir=`echo '@octincludedir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +octlocaledir=`echo '@octlocaledir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +octtestsdir=`echo '@octtestsdir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +startupfiledir=`echo '@startupfiledir@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` +texi_macros_file=`echo '@texi_macros_file@' | sed "s|^${prefix}/\\+||" | sed 's|\"|\\\\\\\"|g'` ## Replace portions of compiler flags that depend on prefix on target -cppflags=`echo "@CPPFLAGS@" | sed "s|@prefix@|\$\{prefix\}|g"` -fftw3f_ldflags=`echo "@FFTW3F_LDFLAGS@" | sed "s|@prefix@|\$\{prefix\}|g"` -fftw3_ldflags=`echo "@FFTW3_LDFLAGS@" | sed "s|@prefix@|\$\{prefix\}|g"` -flibs=`echo "@FLIBS@" | sed "s|@prefix@|\$\{prefix\}|g"` -ldflags=`echo "@LDFLAGS@" | sed "s|@prefix@|\$\{prefix\}|g"` -oct_link_opts=`echo "@OCT_LINK_OPTS@" | sed "s|@prefix@|\$\{prefix\}|g"` +cppflags=`echo '@CPPFLAGS@' | sed "s|@prefix@|\$\{prefix\}|g" | sed 's|\"|\\\\\\\"|g'` +fftw3f_ldflags=`echo '@FFTW3F_LDFLAGS@' | sed "s|@prefix@|\$\{prefix\}|g" | sed 's|\"|\\\\\\\"|g'` +fftw3_ldflags=`echo '@FFTW3_LDFLAGS@' | sed "s|@prefix@|\$\{prefix\}|g" | sed 's|\"|\\\\\\\"|g'` +flibs=`echo '@FLIBS@' | sed "s|@prefix@|\$\{prefix\}|g" | sed 's|\"|\\\\\\\"|g'` +ldflags=`echo '@LDFLAGS@' | sed "s|@prefix@|\$\{prefix\}|g" | sed 's|\"|\\\\\\\"|g'` +oct_link_opts=`echo '@OCT_LINK_OPTS@' | sed "s|@prefix@|\$\{prefix\}|g" | sed 's|\"|\\\\\\\"|g'` srcdir="@srcdir@"