Mercurial > mxe-octave

comparison src/of-linear-algebra-1-cross-fixes.patch @ 3920:a0cd80b7bad4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-linear-algrebra: update patch to allow install from precompiled files * src/of-linear-algebra-1-cross-fixes.patch: update of Makefile
author John Donoghue
date Tue, 28 Apr 2015 08:13:04 -0400
parents 1aff35ff98c1
children
comparison
equal deleted inserted replaced
3919:282ca0892ed0 3920:a0cd80b7bad4
1 Only in linear-algebra.orig/src: autom4te.cache
2 diff -ur linear-algebra.orig/src/configure linear-algebra/src/configure 1 diff -ur linear-algebra.orig/src/configure linear-algebra/src/configure
3 --- linear-algebra.orig/src/configure 2015-04-23 17:02:51.860802263 -0400 2 --- linear-algebra.orig/src/configure 2015-04-28 07:57:58.455790565 -0400
4 +++ linear-algebra/src/configure 2015-04-24 10:32:00.984766575 -0400 3 +++ linear-algebra/src/configure 2015-04-28 07:59:16.904304093 -0400
5 @@ -1,11 +1,9 @@ 4 @@ -1,11 +1,9 @@
6 #! /bin/sh 5 #! /bin/sh
7 # Guess values for system-dependent variables and create Makefiles. 6 # Guess values for system-dependent variables and create Makefiles.
8 -# Generated by GNU Autoconf 2.68. 7 -# Generated by GNU Autoconf 2.68.
9 +# Generated by GNU Autoconf 2.69. 8 +# Generated by GNU Autoconf 2.69.
604 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 603 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
605 esac 604 esac
606 ;; 605 ;;
607 esac 606 esac
608 diff -ur linear-algebra.orig/src/configure.base linear-algebra/src/configure.base 607 diff -ur linear-algebra.orig/src/configure.base linear-algebra/src/configure.base
609 --- linear-algebra.orig/src/configure.base 2015-04-23 17:02:51.860802263 -0400 608 --- linear-algebra.orig/src/configure.base 2015-04-28 07:57:58.456790584 -0400
610 +++ linear-algebra/src/configure.base 2015-04-24 10:31:56.972688364 -0400 609 +++ linear-algebra/src/configure.base 2015-04-28 07:59:16.905304112 -0400
611 @@ -49,6 +49,8 @@ 610 @@ -49,6 +49,8 @@
612 dnl Check for mkoctfile 611 dnl Check for mkoctfile
613 AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile) 612 AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile)
614 test -z "$MKOCTFILE" && AC_MSG_WARN([no mkoctfile found on path]) 613 test -z "$MKOCTFILE" && AC_MSG_WARN([no mkoctfile found on path])
615 +AC_CHECK_PROG(OCTAVE_CONFIG,octave-config,octave-config) 614 +AC_CHECK_PROG(OCTAVE_CONFIG,octave-config,octave-config)
649 octave: $OCTAVE (version $OCTAVE_VERSION) 648 octave: $OCTAVE (version $OCTAVE_VERSION)
650 - mkoctfile: $MKOCTFILE for Octave $subver" 649 - mkoctfile: $MKOCTFILE for Octave $subver"
651 + mkoctfile: $MKOCTFILE for Octave $subver 650 + mkoctfile: $MKOCTFILE for Octave $subver
652 + octave-config: $OCTAVE_CONFIG for Octave $subver" 651 + octave-config: $OCTAVE_CONFIG for Octave $subver"
653 diff -ur linear-algebra.orig/src/Makeconf.in linear-algebra/src/Makeconf.in 652 diff -ur linear-algebra.orig/src/Makeconf.in linear-algebra/src/Makeconf.in
654 --- linear-algebra.orig/src/Makeconf.in 2015-04-23 17:02:51.860802263 -0400 653 --- linear-algebra.orig/src/Makeconf.in 2015-04-28 07:57:58.456790584 -0400
655 +++ linear-algebra/src/Makeconf.in 2015-04-24 10:28:22.596509366 -0400 654 +++ linear-algebra/src/Makeconf.in 2015-04-28 07:59:16.905304112 -0400
656 @@ -52,6 +52,7 @@ 655 @@ -52,6 +52,7 @@
657 OCTAVE = @OCTAVE@ 656 OCTAVE = @OCTAVE@
658 OCTAVE_VERSION = @OCTAVE_VERSION@ 657 OCTAVE_VERSION = @OCTAVE_VERSION@
659 MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v 658 MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v
660 +OCTAVE_CONFIG = @OCTAVE_CONFIG@ 659 +OCTAVE_CONFIG = @OCTAVE_CONFIG@
661 SHLEXT = @SHLEXT@ 660 SHLEXT = @SHLEXT@
662 661
663 ver = @ver@ 662 ver = @ver@
664 diff -ur linear-algebra.orig/src/Makefile linear-algebra/src/Makefile 663 diff -ur linear-algebra.orig/src/Makefile linear-algebra/src/Makefile
665 --- linear-algebra.orig/src/Makefile 2015-04-23 17:02:51.833801732 -0400 664 --- linear-algebra.orig/src/Makefile 2015-04-28 07:57:58.455790565 -0400
666 +++ linear-algebra/src/Makefile 2015-04-24 10:38:46.120667412 -0400 665 +++ linear-algebra/src/Makefile 2015-04-28 08:09:03.787626987 -0400
667 @@ -1,7 +1,7 @@ 666 @@ -1,7 +1,7 @@
668 sinclude Makeconf 667 sinclude Makeconf
669 668
670 ifndef OCTAVE_FORGE 669 ifndef OCTAVE_FORGE
671 -MKOCTFILE = mkoctfile 670 -MKOCTFILE = mkoctfile
672 +MKOCTFILE ?= mkoctfile 671 +MKOCTFILE ?= mkoctfile
673 endif 672 endif
674 673
675 ifndef LAPACK_LIBS 674 ifndef LAPACK_LIBS
676 @@ -53,7 +53,7 @@ 675 @@ -21,7 +21,7 @@
676
677 OBJECTS = $(GSVD_OBJECTS)
678 TARGETS = $(GSVD_TARGET)
679 -DEPENDS = $(GSVD_DEPENDS)
680 +#DEPENDS = $(GSVD_DEPENDS)
681
682 .PHONY: all test clean count
683
684 @@ -44,7 +44,6 @@
685 $(MKOCTFILE) $(DEFINES) -M $<
686
687 %.o:%.cc
688 -%.o:%.cc %.d
689 $(MKOCTFILE) $(DEFINES) -c $<
690
691 %.o:%.f
692 @@ -53,7 +52,7 @@
677 $(MKOCTFILE) $(DEFINES) $< -o $@ 693 $(MKOCTFILE) $(DEFINES) $< -o $@
678 694
679 %.oct: %.cc 695 %.oct: %.cc
680 - mkoctfile $(DEFINES) $< -o $@ ${LAPACK_LIBS} 696 - mkoctfile $(DEFINES) $< -o $@ ${LAPACK_LIBS}
681 + $(MKOCTFILE) $(DEFINES) $< -o $@ ${LAPACK_LIBS} 697 + $(MKOCTFILE) $(DEFINES) $< -o $@ ${LAPACK_LIBS}
682 698
683 .phony: test 699 .phony: test
684 test: $(GSVD_TEST) 700 test: $(GSVD_TEST)
701 Only in linear-algebra/src: Makefile.orig