e46f5fa689
allow overriding MKOCTFILE_* and use it to provide a full path gfortran, so the invocation doesn't fail because gfortran isn't normally in PATH Force the use of bsdtar. unpacking yielding random PaxHeaders.1234 triggers an octave package sanity check making the build of the 'signal' package fail with a cryptic error with no further diagnostics. bump PKGREVISION
43 lines
1.4 KiB
Text
43 lines
1.4 KiB
Text
$NetBSD: patch-configure.ac,v 1.4 2017/08/01 11:06:18 maya Exp $
|
|
|
|
install .oct loadable modules with INSTALL_LIB to avoid stripping them
|
|
|
|
Allow overriding MKOCTFILE_F77 so we can install a full path gfortran
|
|
(for building octave-forge packages like control)
|
|
|
|
--- configure.ac.orig 2016-11-13 15:19:37.000000000 +0000
|
|
+++ configure.ac
|
|
@@ -208,8 +208,11 @@ AC_PROG_LN_S
|
|
AC_PROG_MKDIR_P
|
|
|
|
AC_PROG_INSTALL
|
|
-INSTALL_SCRIPT="${INSTALL}"
|
|
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
|
|
AC_SUBST(INSTALL_SCRIPT)
|
|
+test -z "$INSTALL_LIB" && INSTALL_LIB='${INSTALL_SCRIPT}'
|
|
+AC_SUBST(INSTALL_LIB)
|
|
+
|
|
|
|
OCTAVE_PROG_DESKTOP_FILE_INSTALL
|
|
|
|
@@ -1074,13 +1077,13 @@ if test "$cross_compiling" = yes && test
|
|
MKOCTFILE_LD_CXX=`echo "$LD_CXX" | $SED "s,$CROSS_TOOL_PREFIX,,"`
|
|
MKOCTFILE_RANLIB=`echo "$RANLIB" | $SED "s,$CROSS_TOOL_PREFIX,,"`
|
|
else
|
|
- MKOCTFILE_AR="$AR"
|
|
- MKOCTFILE_CC="$CC"
|
|
- MKOCTFILE_CXX="$CXX"
|
|
- MKOCTFILE_DL_LD="$DL_LD"
|
|
- MKOCTFILE_F77="$F77"
|
|
- MKOCTFILE_LD_CXX="$LD_CXX"
|
|
- MKOCTFILE_RANLIB="$RANLIB"
|
|
+ MKOCTFILE_AR="${MKOCTFILE_AR-$AR}"
|
|
+ MKOCTFILE_CC="${MKOCTFILE_CC-$CC}"
|
|
+ MKOCTFILE_CXX="${MKOCTFILE_CXX-$CXX}"
|
|
+ MKOCTFILE_DL_LD="${MKOCTFILE_DL_LD-$DL_LD}"
|
|
+ MKOCTFILE_F77="${MKOCTFILE_F77-$F77}"
|
|
+ MKOCTFILE_LD_CXX="${MKOCTFILE_LD_CXX-$LD_CXX}"
|
|
+ MKOCTFILE_RANLIB="${MKOCTFILE_RANLIB-$RANLIB}"
|
|
fi
|
|
AC_MSG_NOTICE([defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX])
|
|
AC_MSG_NOTICE([defining MKOCTFILE_AR to be $MKOCTFILE_AR])
|