Mercurial > mxe-octave

changeset 4750:a65bf962f556

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-ltfat: update to v2.3.1 * src/of-ltfat.mk: update version/checksum, pass config options when cross compile * src/of-ltfat-1-fixes.patch: removed file. * dist-files.mk: removed ref to of-ltfat-1-fixes.patch
author John Donoghue
date Fri, 29 Jun 2018 12:20:35 -0400
parents ad711297712a
children 2e43e7e36a8e
files dist-files.mk src/of-ltfat-1-fixes.patch src/of-ltfat.mk
diffstat 3 files changed, 9 insertions(+), 77 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Fri Jun 29 10:41:56 2018 -0400
+++ b/dist-files.mk	Fri Jun 29 12:20:35 2018 -0400
@@ -489,7 +489,6 @@
   of-linear-algebra-4-fixes.patch \
   of-linear-algebra.mk \
   of-lssa.mk \
-  of-ltfat-1-fixes.patch \
   of-ltfat.mk \
   of-mapping.mk \
   of-miscellaneous-1-fixes.patch \
--- a/src/of-ltfat-1-fixes.patch	Fri Jun 29 10:41:56 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-diff -uNr a/src/configure b/src/configure
---- a/src/configure	2016-12-20 12:05:08.000000000 -0500
-+++ b/src/configure	2017-10-12 14:13:16.956665770 -0400
-@@ -587,7 +587,7 @@
- ac_subst_vars='LTLIBOBJS
- LIBOBJS
- have_libportaudio
--MKOCTFILE_CHECK
-+MKOCTFILE
- ac_ct_CXX
- CXXFLAGS
- CXX
-@@ -3082,11 +3082,11 @@
- set dummy mkoctfile; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_MKOCTFILE_CHECK+:} false; then :
-+if ${ac_cv_prog_MKOCTFILE+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test -n "$MKOCTFILE_CHECK"; then
--  ac_cv_prog_MKOCTFILE_CHECK="$MKOCTFILE_CHECK" # Let the user override the test.
-+  if test -n "$MKOCTFILE"; then
-+  ac_cv_prog_MKOCTFILE="$MKOCTFILE" # Let the user override the test.
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
-@@ -3095,7 +3095,7 @@
-   test -z "$as_dir" && as_dir=.
-     for ac_exec_ext in '' $ac_executable_extensions; do
-   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_MKOCTFILE_CHECK=""yes""
-+    ac_cv_prog_MKOCTFILE="mkoctfile"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
-@@ -3105,17 +3105,17 @@
- 
- fi
- fi
--MKOCTFILE_CHECK=$ac_cv_prog_MKOCTFILE_CHECK
--if test -n "$MKOCTFILE_CHECK"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKOCTFILE_CHECK" >&5
--$as_echo "$MKOCTFILE_CHECK" >&6; }
-+MKOCTFILE=$ac_cv_prog_MKOCTFILE
-+if test -n "$MKOCTFILE"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKOCTFILE" >&5
-+$as_echo "$MKOCTFILE" >&6; }
- else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
- 
--if test "$MKOCTFILE_CHECK" != "yes" ; then
-+if test -z "$MKOCTFILE"; then
-     as_fn_error $? "Please install mkoctfile." "$LINENO" 5
- fi
- 
-diff -uNr a/src/configure.ac b/src/configure.ac
---- a/src/configure.ac	2016-12-20 12:05:08.000000000 -0500
-+++ b/src/configure.ac	2017-10-12 14:08:11.627023155 -0400
-@@ -26,8 +26,8 @@
- #fi
- 
- dnl Check for MKOCTFILE
--AC_CHECK_PROG(MKOCTFILE_CHECK,mkoctfile,"yes")
--if test "$MKOCTFILE_CHECK" != "yes" ; then
-+AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile)
-+if test -z "$MKOCTFILE"; then
-     AC_MSG_ERROR([Please install mkoctfile.])
- fi
- 
--- a/src/of-ltfat.mk	Fri Jun 29 10:41:56 2018 -0400
+++ b/src/of-ltfat.mk	Fri Jun 29 12:20:35 2018 -0400
@@ -3,8 +3,8 @@
 
 PKG             := of-ltfat
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.2.0
-$(PKG)_CHECKSUM := ee330536fc126cc2f32d30074f8e4e641f0a070c
+$(PKG)_VERSION  := 2.3.1
+$(PKG)_CHECKSUM := 2c87141b877f721e10cbb4a99dca1cb880dce8d8
 $(PKG)_REMOTE_SUBDIR :=
 $(PKG)_SUBDIR   := ltfat
 $(PKG)_FILE     := ltfat-$($(PKG)_VERSION).tar.gz
@@ -15,10 +15,16 @@
     $(PKG)_DEPS += $(OCTAVE_TARGET)
 endif
 
+ifeq ($(MXE_SYSTEM),mingw)
+$(PKG)_OPTIONS := OPTCXXFLAGS='-DLTFAT_BUILD_STATIC -DMINGW=1' MINGW=1
+else
+$(PKG)_OPTIONS := 
+endif
+
 define $(PKG)_UPDATE
     $(OCTAVE_FORGE_PKG_UPDATE)
 endef
 
 define $(PKG)_BUILD
-    $(OCTAVE_FORGE_PKG_BUILD)
+    $(call OCTAVE_FORGE_PKG_BUILD,$(1),$(2),$(3),$($(PKG)_OPTIONS))
 endef