Changeset 146132 for trunk/dports/math


Ignore:
Timestamp:
Feb 29, 2016, 6:04:20 PM (4 years ago)
Author:
michaelld@…
Message:

octave-tsa: update to 4.4.1; addresses ticket #50746.

Location:
trunk/dports/math/octave-tsa
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/math/octave-tsa/Portfile

    r143910 r146132  
    55PortGroup           octave 1.0
    66
    7 octave.setup        tsa 4.3.3
     7octave.setup        tsa 4.4.1
    88platforms           darwin
    99license             GPL-3+
     
    1313long_description    ${description}
    1414
    15 checksums           rmd160 e56696528eea259eb822980f1b40251069c734ca \
    16                     sha256 76f100d53706aa2185357ecfbf84fe8b1d367f3304775ca524fb4cda6b02ebc0
     15checksums           rmd160 5297ad5396f8a93c66e08cf9e916c2125fbf0662 \
     16                    sha256 d4d0053cd73b2633e24e80a61bb0b413c99b39a24b8f0daf8364843d1a47780d
    1717
    1818patchfiles          patch-src_Makefile.diff
  • trunk/dports/math/octave-tsa/files/patch-src_Makefile.diff

    r140284 r146132  
    1 --- src/Makefile.orig   2015-01-25 17:26:10.000000000 -0500
    2 +++ src/Makefile        2015-01-25 17:30:51.000000000 -0500
    3 @@ -4,123 +4,22 @@
    4  # http://pub.ist.ac.at/~schloegl/matlab/tsa/
    5  ####################################################
    6  
    7 -### modify directories according to your needs
    8 -
    9 -# Define non-default octave-version
    10 -# Octave - global install  (e.g. from debian package)
    11 -# OCTAVE_VERSION=
    12 -# Better alternative: define an OCTAVE_VERSION bash variable (or in .bashrc or .profile)
    13 -# OCTAVE_VERSION=-3.6.3
    14 -
    15 -# Matlab configuration
    16 -# MATLABDIR = /usr/local/MATLAB/R2010b
    17 -# comment the following line if you use MATLAB on 32-bit operating system
     1--- src/Makefile.orig   2016-02-26 09:09:55.000000000 -0600
     2+++ src/Makefile        2016-02-29 11:33:07.000000000 -0600
     3@@ -15,74 +15,74 @@
     4 # Matlab configuration
     5 # MATLABDIR = /usr/local/MATLAB/R2010b
     6 # comment the following line if you use MATLAB on 32-bit operating system
    187-MEX_OPTION += -largeArrayDims
    198-
     
    4231-CC     ?= gcc
    4332-CXX    ?= g++
     33+# MEX_OPTION += -largeArrayDims
     34+#
     35+# # Mingw crosscompiler: available at http://www.nongnu.org/mingw-cross-env/
     36+# CROSS   = $(HOME)/src/mxe/usr/bin/i686-w64-mingw32.static
     37+# CROSS64 = $(HOME)/src/mxe/usr/bin/x86_64-w64-mingw32.static
     38+# # include directory for Win32-Matlab include
     39+# W32MAT_INC = -I$(HOME)/bin/win32/Matlab/R2010b/extern/include/
     40+# W64MAT_INC = -I$(HOME)/bin/win64/Matlab/R2010b/extern/include/
     41+# # path to GNUMEX libraries, available from here http://sourceforge.net/projects/gnumex/
     42+# GNUMEX   = $(HOME)/bin/win32/gnumex
     43+# GNUMEX64 = $(HOME)/bin/win64/gnumex
     44+# # building gnumex64 was difficult, these hints were quite useful:
     45+# # http://sourceforge.net/mailarchive/forum.php?thread_name=AANLkTinZvxgC9ezp2P3UCX_a7TAUYuVsp2U40MQUV6qr%40mail.gmail.com&forum_name=gnumex-users
     46+# # Instead of building "mex shortpath.c" and "mex uigetpath.c", I used empty m-functions within argout=argin;
     47+# ####################################################
     48+# W32MAT_INC += -I$(subst /usr/bin/,/usr/,$(CROSS))/include/
     49+# W64MAT_INC += -I$(subst /usr/bin/,/usr/,$(CROSS64))/include/
     50+# LDLIBS_W32 = $(subst /usr/bin/,/usr/,$(CROSS))/lib/
     51+# LDLIBS_W64 = $(subst /usr/bin/,/usr/,$(CROSS64))/lib/
     52+# W32_LIBS  = $(LDLIBS_W32)liblapack.a
     53+# W64_LIBS  = $(LDLIBS_W64)liblapack.a
     54+# W32_LIBS += $(LDLIBS_W32)libblas.a
     55+# W64_LIBS += $(LDLIBS_W64)libblas.a
     56+#
     57+# CC   ?= gcc
     58+# CXX  ?= g++
    4459 CFLAGS         = -Wall -Wextra -Wconversion -O2 -fPIC
    4560-OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex -lgomp
    46 +MKOCTFILE = $(PREFIX_BIN)/mkoctfile -v
    47 +OCTMEX = $(MKOCTFILE) --mex
     61+OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex
    4862 RM      = rm
    4963 
     64 # Support Debian Hardening flags
     65 # https://wiki.debian.org/HardeningWalkthrough#Handling_dpkg-buildflags_in_your_upstream_build_system
     66-CFLAGS += $(CPPFLAGS)
     67-
    5068-ifneq (Darwin,$(shell uname))
    5169-CFLAGS      += -fopenmp
     
    5674-MATMEX      = $(MATLABDIR)/bin/mex $(MEX_OPTION)
    5775-
    58 -PROGS = covm_mex.mex sumskipnan_mex.mex #
     76-PROGS       = covm_mex.mex sumskipnan_mex.mex histo_mex.mex #
    5977-
    60 -### per default only the mex-files for octave are built
    61 -mex4o octave: $(PROGS)
    62 -
    63 -
    64 -### Matlab configuration - search for a matlab directory if not defined above
     78+# CFLAGS += $(CPPFLAGS)
     79+#
     80+# ifneq (Darwin,$(shell uname))
     81+# CFLAGS      += -fopenmp
     82+# MEX_OPTION  += -lgomp
     83+# endif
     84+#
     85+# MEX_OPTION  += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
     86+# MATMEX      = $(MATLABDIR)/bin/mex $(MEX_OPTION)
     87+#
     88+# PROGS       = covm_mex.mex sumskipnan_mex.mex histo_mex.mex #
     89+#
     90 ### per default only the mex-files for octave are built
     91 mex4o octave: $(PROGS)
     92 
     93 
     94 ### Matlab configuration - search for a matlab directory if not defined above
    6595-ifeq (,$(MATLABDIR))
    6696-  ifneq (,$(shell ls -1 /usr/local/ |grep MATLAB))
     
    82112-mexw64 win64:  $(patsubst %.mex, %.mexw64, $(PROGS))
    83113-all:    octave win32 win64 mex4m
    84 +PROGS = covm_mex.mex sumskipnan_mex.mex
    85 +
    86 +octave: $(PROGS)
    87 +
     114+# ifeq (,$(MATLABDIR))
     115+#   ifneq (,$(shell ls -1 /usr/local/ |grep MATLAB))
     116+#     # use oldest, typically mex-files a compatible with newer Matlab versions
     117+#     MATLABDIR=/usr/local/MATLAB/$(shell ls -1rt /usr/local/MATLAB/  |grep "^R*" |head -1)
     118+#   endif
     119+# endif
     120+#
     121+# ### if MATLABDIR has been found or defined
     122+# ifneq (,$(MATLABDIR))
     123+#   ifneq (,$(shell ls -1 $(MATLABDIR)/bin/mexext))
     124+#     MEX_EXT=$(shell $(MATLABDIR)/bin/mexext)
     125+#     mex4m matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS))
     126+#   endif
     127+# endif
     128+#
     129+#
     130+# mexw32 win32:  $(patsubst %.mex, %.mexw32, $(PROGS))
     131+# mexw64 win64:  $(patsubst %.mex, %.mexw64, $(PROGS))
    88132+all:    octave
    89133 
    90134 clean:
    91135        -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
    92  
    93 -
    94  #########################################################
    95 -
     136@@ -93,7 +93,7 @@
    96137 #      Octave, MATLAB on Linux
    97138 #########################################################
    98 -%.oct: %.cc
     139 %.oct: %.cc
    99140-       mkoctfile$(OCTAVE_VERSION) "$<"
    100 -
     141+       mkoctfile "$<"
     142 
    101143 %.mex: %.cpp
    102144        $(OCTMEX) "$<" -llapack -lblas
    103 -%.$(MEX_EXT): %.cpp
    104 -       $(MATMEX) "$<" -llapack -lblas
    105 -
    106 -
    107 -#########################################################
    108 -#      MATLAB/WIN32
    109 -#########################################################
     145@@ -104,13 +104,13 @@
     146 #########################################################
     147 #      MATLAB/WIN32
     148 #########################################################
    110149-%.obj: %.cpp
    111150-       $(CROSS)-$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W32MAT_INC) -O2 -DMX_COMPAT_32 "$<"
     
    115154-%.mexw32: %.obj
    116155-       $(CROSS)-$(CXX) -shared $(GNUMEX)/mex.def -o "$@" -L$(GNUMEX) -s "$<" -llibmx -llibmex -llibmat -lcholmod -lgomp -lpthread -L$(LDLIBS_W32) -lblas -llapack
    117 -
    118 -
    119 -#########################################################
    120 -#      MATLAB/WIN64
    121 -#########################################################
    122 -
    123 -## ToDO: fix OpenMP support: currently -fopenmp causes Matlab to crash
     156+# %.obj: %.cpp
     157+#      $(CROSS)-$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W32MAT_INC) -O2 -DMX_COMPAT_32 "$<"
     158+# %.obj: %.c
     159+#      $(CROSS)-$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W32MAT_INC) -O2 -DMX_COMPAT_32 "$<"
     160+#
     161+# %.mexw32: %.obj
     162+#      $(CROSS)-$(CXX) -shared $(GNUMEX)/mex.def -o "$@" -L$(GNUMEX) -s "$<" -llibmx -llibmex -llibmat -lcholmod -lgomp -lpthread -L$(LDLIBS_W32) -lblas -llapack
     163 
     164 
     165 #########################################################
     166@@ -118,13 +118,13 @@
     167 #########################################################
     168 
     169 ## ToDO: fix OpenMP support: currently -fopenmp causes Matlab to crash
    124170-%.o64: %.cpp
    125171-       $(CROSS64)-$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W64MAT_INC) -O2 "$<"
     
    129175-%.mexw64: %.o64
    130176-       $(CROSS64)-$(CXX) -shared $(GNUMEX64)/mex.def -o "$@" -L$(GNUMEX64) -s "$<" -llibmx -llibmex -llibmat -lcholmod -lgomp -lpthread -L$(LDLIBS_W64) -lblas -llapack
    131 -       
    132 -       
    133 -
     177+# %.o64: %.cpp
     178+#      $(CROSS64)-$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W64MAT_INC) -O2 "$<"
     179+# %.o64: %.c
     180+#      $(CROSS64)-$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W64MAT_INC) -O2 "$<"
     181+#
     182+# %.mexw64: %.o64
     183+#      $(CROSS64)-$(CXX) -shared $(GNUMEX64)/mex.def -o "$@" -L$(GNUMEX64) -s "$<" -llibmx -llibmex -llibmat -lcholmod -lgomp -lpthread -L$(LDLIBS_W64) -lblas -llapack
     184       
     185       
     186 
Note: See TracChangeset for help on using the changeset viewer.