Mercurial > mxe-octave

changeset 5645:8645df9cd530

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
default-octave.mk: Double-quote paths in configure variables (bug #59923). * src/default-octave.mk: Double quote paths in configure variables.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 24 Jan 2021 14:17:54 +0100
parents b03d8ffdbaa2
children 83f1a9946ffc
files src/default-octave.mk
diffstat 1 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/default-octave.mk	Mon Jan 25 15:08:24 2021 -0500
+++ b/src/default-octave.mk	Sun Jan 24 14:17:54 2021 +0100
@@ -117,6 +117,15 @@
   $(PKG)_ENABLE_FORTRAN_INT64_CONFIGURE_OPTIONS := ax_blas_f77_func_ok=yes ax_blas_integer_size=4 octave_cv_sizeof_fortran_integer=4
 endif
 
+# This is very similar to CONFIGURE_CPPFLAGS and CONFIGURE_LDFLAGS but with
+# double quoted paths.
+$(PKG)_CONFIGURE_CPPFLAGS := CPPFLAGS='-I"$(HOST_PREFIX)/include"'
+ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
+  $(PKG)_CONFIGURE_LDFLAGS := LDFLAGS='-L"$(HOST_PREFIX)/lib" -L"$(HOST_PREFIX)/lib64"'
+else
+  $(PKG)_CONFIGURE_LDFLAGS := LDFLAGS='-L"$(HOST_PREFIX)/lib"'
+endif
+
 ifeq ($(MXE_SYSTEM),msvc)
   $(PKG)_PREFIX := '$(HOST_PREFIX)/local/$($(PKG)_SUBDIR)'
   # - Enable atomic refcount (required for QtHandles)
@@ -132,7 +141,7 @@
 else
   $(PKG)_PREFIX := '$(HOST_PREFIX)'
   $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
-    LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR) -L$($(PKG)_QTDIR)/lib'
+    LDFLAGS='-Wl,-rpath-link,"$(HOST_LIBDIR)" -L"$(HOST_LIBDIR)" -L"$($(PKG)_QTDIR)/lib"'
 endif
 
 ifeq ($(MXE_SYSTEM),mingw)
@@ -174,7 +183,8 @@
 
     mkdir '$(1)/.build'
     cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
-        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $($(PKG)_CONFIGURE_CPPFLAGS) \
+        $($(PKG)_CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$($(PKG)_PREFIX)' \
         --disable-silent-rules \