[freefempp] 04/07: Fix duplication of executables and FTBS on kfreeBSD and Hurd
Dimitrios Eftaxiopoulos
eftaxiop-guest at moszumanska.debian.org
Wed Dec 18 22:27:24 UTC 2013
This is an automated email from the git hooks/post-receive script.
eftaxiop-guest pushed a commit to branch master
in repository freefempp.
commit 44dcf962a51c1dd7a4f23ba8220b0d895b46d638
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Tue Dec 17 23:55:45 2013 +0200
Fix duplication of executables and FTBS on kfreeBSD and Hurd
---
debian/patches/examples++-load.patch | 2 +-
debian/results.txt | 5 +
debian/rules | 4 +-
debian/source/options | 2 +-
download/fftw/Makefile | 275 ++++++++++++++++-------------------
download/gmm/cxxflags | 14 +-
examples++-3d/all.edp | 108 +++++++-------
src/fflib/strversionnumber.cpp | 4 +-
8 files changed, 196 insertions(+), 218 deletions(-)
diff --git a/debian/patches/examples++-load.patch b/debian/patches/examples++-load.patch
index 59d8af2..90d7e6b 100644
--- a/debian/patches/examples++-load.patch
+++ b/debian/patches/examples++-load.patch
@@ -86,7 +86,7 @@ Add ability to compile freefem++ with Ipopt, freeyams, mmg3d_v4, mshmet, mumps_s
# SUF=dll
;;
- FreeBSD|NetBSD)
-+ kfreebsd-i386|kfreebsd-amd64|hurd-i386)
++ FreeBSD|NetBSD|GNU|GNU/kFreeBSD)
SHARED="-shared"
FLAGS='-fPIC';;
# 64 bit Linux needs -fPIC (ALH)
diff --git a/debian/results.txt b/debian/results.txt
new file mode 100644
index 0000000..c5a6fbb
--- /dev/null
+++ b/debian/results.txt
@@ -0,0 +1,5 @@
+# Automatically generated
+# duptype id depth size device inode priority name
+DUPTYPE_FIRST_OCCURRENCE 1 0 57699578 2053 12845163 1 debian/tmp/usr/bin/FreeFem++
+DUPTYPE_WITHIN_SAME_TREE -1 0 57699578 2053 12845164 1 debian/tmp/usr/bin/FreeFem++-nw
+# end of file
diff --git a/debian/rules b/debian/rules
index 1e4ab85..f0ad8f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,8 +89,8 @@ override_dh_autoreconf:
override_dh_auto_install:
dh_auto_install
mv debian/tmp/usr/bin/bamg debian/tmp/usr/bin/ffbamg
-# rdfind -outputname debian/results.txt -makesymlinks true debian/tmp/usr/bin/
-# symlinks -r -s -c debian/tmp/usr/bin/
+ rdfind -outputname debian/results.txt -makesymlinks true debian/tmp/usr/bin/
+ symlinks -r -s -c debian/tmp/usr/bin/
# #
# # Install modified script to create plugins
diff --git a/debian/source/options b/debian/source/options
index 3b11538..c251a66 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1 +1 @@
- extend-diff-ignore = "(^|/)(examples\+\+-load/all\.edp|examples\+\+-3d/all\.edp|DOC/freefem\+\+doc\.pdf|download/gmm/cxxflags|src/fflib/strversionnumber\.cpp|download/nlopt/config\.log|examples\+\+-eigen/freefem\+\+\.pref|examples\+\+-load/Missing-plugins-so\.log|examples\+\+-load/WHERE_LIBRARY-download-new|examples\+\+/freefem\+\+\.pref|configure\.ac|examples\+\+-chapt3/freefem\+\+\.pref|examples\+\+-mpi/Missing-plugins-so\.log|download/pkg/MUMPS_4\.10\.0\.tar\.gz|download/fftw/Makefil [...]
\ No newline at end of file
+ extend-diff-ignore = "(^|/)(examples\+\+-load/all\.edp|examples\+\+-3d/all\.edp|DOC/freefem\+\+doc\.pdf|download/gmm/cxxflags|src/fflib/strversionnumber\.cpp|download/nlopt/config\.log|examples\+\+-eigen/freefem\+\+\.pref|examples\+\+-load/Missing-plugins-so\.log|examples\+\+-load/WHERE_LIBRARY-download-new|examples\+\+/freefem\+\+\.pref|configure\.ac|examples\+\+-chapt3/freefem\+\+\.pref|examples\+\+-mpi/Missing-plugins-so\.log|download/pkg/MUMPS_4\.10\.0\.tar\.gz|download/fftw/Makefil [...]
\ No newline at end of file
diff --git a/download/fftw/Makefile b/download/fftw/Makefile
index 1d8af13..ecf40fa 100644
--- a/download/fftw/Makefile
+++ b/download/fftw/Makefile
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.13.1 from Makefile.am.
# download/fftw/Makefile. Generated from Makefile.in by configure.
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -17,51 +17,23 @@
# Downloading and compiling extra libraries
# -----------------------------------------
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
- case $${target_option-} in \
- ?) ;; \
- *) echo "am__make_running_with_option: internal error: invalid" \
- "target option '$${target_option-}' specified" >&2; \
- exit 1;; \
- esac; \
- has_opt=no; \
- sane_makeflags=$$MAKEFLAGS; \
- if $(am__is_gnu_make); then \
- sane_makeflags=$$MFLAGS; \
- else \
+am__make_dryrun = \
+ { \
+ am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- bs=\\; \
- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
- esac; \
- fi; \
- skip_next=no; \
- strip_trailopt () \
- { \
- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
- }; \
- for flg in $$sane_makeflags; do \
- test $$skip_next = yes && { skip_next=no; continue; }; \
- case $$flg in \
- *=*|--*) continue;; \
- -*I) strip_trailopt 'I'; skip_next=yes;; \
- -*I?*) strip_trailopt 'I';; \
- -*O) strip_trailopt 'O'; skip_next=yes;; \
- -*O?*) strip_trailopt 'O';; \
- -*l) strip_trailopt 'l'; skip_next=yes;; \
- -*l?*) strip_trailopt 'l';; \
- -[dEDm]) skip_next=yes;; \
- -[JT]) skip_next=yes;; \
- esac; \
- case $$flg in \
- *$$target_option*) has_opt=yes; break;; \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
esac; \
- done; \
- test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/freefem++
pkgincludedir = $(includedir)/freefem++
pkglibdir = $(libdir)/freefem++
@@ -78,17 +50,18 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = x86_64-pc-linux-gnu
-host_triplet = x86_64-pc-linux-gnu
+build_triplet = i686-apple-darwin13.0.0
+host_triplet = i686-apple-darwin13.0.0
subdir = download/fftw
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acmacros.m4 \
$(top_srcdir)/acoptim.m4 $(top_srcdir)/acmpi.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -113,108 +86,108 @@ am__can_run_installinfo = \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing aclocal-1.14
+ACLOCAL = aclocal-1.13
ADD_PACKAGE_NAME =
AMTAR = $${TAR-tar}
AM_DEFAULT_VERBOSITY = 1
-AR = ar
-ARFLAGS = rv
-ARPACKLIB =
-ARPACKLIBS = -larpack -llapack
-AUTOCONF = ${SHELL} /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing autoconf
-AUTOHEADER = ${SHELL} /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing autoheader
-AUTOMAKE = ${SHELL} /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing automake-1.14
-AWK = gawk
+AR = libtool
+ARFLAGS = -static -o
+ARPACKLIB = /Users/hecht/work/ff++/download/lib/libarpack.a
+ARPACKLIBS = /Users/hecht/work/ff++/download/lib/libarpack.a
+AUTOCONF = autoconf
+AUTOHEADER = autoheader
+AUTOMAKE = automake-1.13
+AWK = awk
BAMGPROG = bamg cvmsh2
BLASINC =
-BLASLIBS = -lblas
-CC = gcc -Wl,-z,relro
-CCDEPMODE = depmode=none
-CFLAGS = -g -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
+BLASLIBS = -framework vecLib
+CC = clang -isysroot /Applications/Xcode.app//Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -m64 -fPIC -g -fPIC
CFLAGSF77 = -DAdd_
-CNOFLAGS = -fPIC
+CNOFLAGS = -m64 -fPIC
COMPILE_OPENBLAS =
-CPPFLAGS = -D_FORTIFY_SOURCE=2
-CXX = g++ -Wl,-z,relro
-CXXCPP = g++ -Wl,-z,relro -E
-CXXDEPMODE = depmode=none
-CXXFLAGS = -g -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -DNDEBUG -O3 -mmmx -msse -msse2 -DBAMG_LONG_LONG -DNCHECKPTR -fPIC
+CPPFLAGS =
+CXX = clang++ -std=c++11 -isysroot /Applications/Xcode.app//Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk
+CXXCPP = clang++ -std=c++11 -isysroot /Applications/Xcode.app//Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -m64 -fPIC -g -DBAMG_LONG_LONG -DCHECK_KN -fno-inline -fexceptions -fPIC
CYGPATH_W = echo
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
DOCPDF = freefem++doc.pdf
DOCPS = freefem++doc.ps
DOCPSGZ = freefem++doc.ps.gz
-DOWNLOADCOMPILE =
+DOWNLOADCOMPILE = compile-pkg
DOWNLOADED_BLAS =
DOWNLOADED_BLAS_BUILT_SOURCES =
-DOWNLOAD_ARPACK =
-DOWNLOAD_FFTW =
-DOWNLOAD_UMFPACK =
-DYLIB_SUFFIX = so
-ECHO_C =
-ECHO_N = -n
+DOWNLOAD_ARPACK = arpack
+DOWNLOAD_FFTW = fftw
+DOWNLOAD_UMFPACK = umfpack
+DYLIB_SUFFIX = dylib
+ECHO_C = \c
+ECHO_N =
ECHO_T =
-EGREP = /bin/grep -E
+EGREP = /usr/bin/grep -E
EIGENOBJ = eigenvalue.$(OBJEXT)
ENABLE_FFCS = no
EPSTOPDF = epstopdf
EXEEXT =
-F77 = gfortran
-FC = gfortran
+F77 = /usr/local/bin/gfortran
+FC = /usr/local/bin/gfortran
FCFLAGS = -g -O2 -fPIC
FFGLUTNAME =
FFGLUTPROG = ffglut
-FFLAGS = -g -fstack-protector --param=ssp-buffer-size=4 -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
+FFLAGS = -g -m64 -fPIC -g -fPIC
FFMETIS_CFLAGS =
FF_LAPACKdir =
-FF_MALLOC_H = 1
+FF_MALLOC_H =
FF_SECOND = second.o
FF_STATIC_LIB =
FF_UMFPACK_CONFIG =
-FLIBS = /usr/lib/gcc/x86_64-linux-gnu/4.8/libgfortran.so
+FLIBS = /usr/local/lib/gcc/x86_64-apple-darwin13.0.0/4.9.0/../../../libgfortran.dylib
FNOFLAGS = -fPIC
-G2CLIB = /usr/lib/gcc/x86_64-linux-gnu/4.8/libgfortran.so
+G2CLIB = /usr/local/lib/gcc/x86_64-apple-darwin13.0.0/4.9.0/../../../libgfortran.dylib
GCCNOCYGWIN =
-GREP = /bin/grep
+GREP = /usr/bin/grep
HISTORY =
INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-KERNEL_VERSION = 4.8.2
+KERNEL_VERSION =
LAPACKLIBS =
-LAPACK_arpack_LIB =
-LDFLAGS = -Wl,-z,relro -rdynamic
+LAPACK_arpack_LIB = /Users/hecht/work/ff++/download/lib/liblapack.a
+LDFLAGS =
LEX = flex
LEXLIB =
LEX_OUTPUT_ROOT = lex.yy
-LIBC_VERSION = libc-2.17
+LIBC_VERSION =
LIBOBJS =
-LIBS = -ldl -lm /usr/lib/gcc/x86_64-linux-gnu/4.8/libgfortran.so
-LIBSGLUT = -lglut -lGLU -lGL
+LIBS = -lm /usr/local/lib/gcc/x86_64-apple-darwin13.0.0/4.9.0/../../../libgfortran.dylib
+LIBSGLUT = -framework GLUT -framework OpenGL -framework Cocoa
LIBSNOCONSOLE =
LIBSPTHREAD = -lpthread
LOAD_COMPILE = load_compile
LOAD_TESTS = ../regtests.sh
LTLIBOBJS =
-MAINT = #
-MAKEINFO = ${SHELL} /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/missing makeinfo
+MAINT =
+MAKEINFO = makeinfo
MEDITPROG = ffmedit
-MKDIR_P = /bin/mkdir -p
-MPICC = /usr/bin/mpicc
-MPICXX = mpic++ -Wl,-z,relro
-MPIF77 = /usr/bin/mpif90
-MPIFC = /usr/bin/mpif90
-MPIPROG = FreeFem++-mpi
-MPIRUN = /usr/bin/mpirun
-MPISCRIPT = ff-mpirun
+MKDIR_P = ../.././install-sh -c -d
+MPICC =
+MPICXX =
+MPIF77 =
+MPIFC =
+MPIPROG =
+MPIRUN =
+MPISCRIPT =
MPI_INCLUDE =
MPI_INC_DIR =
-MPI_LIB = -Wl,-z,relro
+MPI_LIB =
MPI_LIBC =
-MPI_LIBFC = -pthread -L/usr//lib -L/usr/lib/openmpi/lib -lmpi_f90 -lmpi_f77 -lmpi -ldl -lhwloc
+MPI_LIBFC =
MPI_LIB_DIRS =
NO_RANGE_CHECK =
OBJEXT = o
@@ -229,16 +202,16 @@ PACKAGE_VERSION = 3.26-2
PASTIX_HOSTARCH =
PATH_SEPARATOR = :
RANLIB = ranlib
-RANLIN = ranlib
-SCOTCH_INCLUDE = /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/download/include/scotch
+RANLIN = echo
+SCOTCH_INCLUDE = /Users/hecht/work/ff++/download/include/scotch
SET_MAKE =
-SHELL = /bin/bash
+SHELL = /bin/sh
SIZEOF_INT = 4
SIZEOF_LONG = 8
SIZEOF_PTR = 8
SIZEOF_PTRINBIT = 64
SKIP_TESTS_EIGEN =
-SKIP_TESTS_MPI = no
+SKIP_TESTS_MPI = yes
STATICTOOL =
STDPROG =
STD_GRAPH_OBJ =
@@ -268,53 +241,53 @@ TOOL_COMPILE_superlu = superlu
TOOL_COMPILE_superludist = superludist
TOOL_COMPILE_umfpack = umfpack
TOOL_COMPILE_yams = yams
-TOOL_DYLIB_fflapack = fflapack.so
+TOOL_DYLIB_fflapack = fflapack.dylib
TOOL_DYLIB_gsl =
-TOOL_DYLIB_hips = hips_FreeFem.so
-TOOL_DYLIB_ipopt = ff-Ipopt.so
-TOOL_DYLIB_lapack = lapack.so
-TOOL_DYLIB_metis = metis.so
-TOOL_DYLIB_mmg3d = mmg3d-v4.0.so
-TOOL_DYLIB_mshmet = mshmet.so
-TOOL_DYLIB_mumps = MUMPS_FreeFem.so MUMPS.so
-TOOL_DYLIB_mumps_seq = MUMPS_seq.so
-TOOL_DYLIB_nlopt = ff-NLopt.so
+TOOL_DYLIB_hips = hips_FreeFem.dylib
+TOOL_DYLIB_ipopt = ff-Ipopt.dylib
+TOOL_DYLIB_lapack = lapack.dylib
+TOOL_DYLIB_metis = metis.dylib
+TOOL_DYLIB_mmg3d = mmg3d-v4.0.dylib
+TOOL_DYLIB_mshmet = mshmet.dylib
+TOOL_DYLIB_mumps = MUMPS_FreeFem.dylib MUMPS.dylib
+TOOL_DYLIB_mumps_seq = MUMPS_seq.dylib
+TOOL_DYLIB_nlopt = ff-NLopt.dylib
TOOL_DYLIB_pardiso =
TOOL_DYLIB_parmetis =
-TOOL_DYLIB_parms = parms_FreeFem.so
-TOOL_DYLIB_pastix = interfacepastix.so complex_pastix_FreeFem.so real_pastix_FreeFem.so
-TOOL_DYLIB_pipe = pipe.so
-TOOL_DYLIB_scotch = scotch.so
-TOOL_DYLIB_superlu = SuperLu.so
-TOOL_DYLIB_superludist = complex_SuperLU_DIST_FreeFem.so real_SuperLU_DIST_FreeFem.so dSuperLU_DIST.so
-TOOL_DYLIB_umfpack = UMFPACK64.so
-TOOL_DYLIB_yams = freeyams.so
-UMFPACKLIBS = -lumfpack -lamd -lcholmod -lcolamd
+TOOL_DYLIB_parms = parms_FreeFem.dylib
+TOOL_DYLIB_pastix = interfacepastix.dylib complex_pastix_FreeFem.dylib real_pastix_FreeFem.dylib
+TOOL_DYLIB_pipe = pipe.dylib
+TOOL_DYLIB_scotch = scotch.dylib
+TOOL_DYLIB_superlu = SuperLu.dylib
+TOOL_DYLIB_superludist = complex_SuperLU_DIST_FreeFem.dylib real_SuperLU_DIST_FreeFem.dylib dSuperLU_DIST.dylib
+TOOL_DYLIB_umfpack = UMFPACK64.dylib
+TOOL_DYLIB_yams = freeyams.dylib
+UMFPACKLIBS = -L/Users/hecht/work/ff++/download/lib -lumfpack -lcholmod -lcolamd -lamd -lsuitesparseconfig
VERSION = 3.26-2
WGET = wget --no-check-certificate
WIN32DLLTARGET =
WINDRESOBJ =
YACC = bison -y
YFLAGS =
-abs_builddir = /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/download/fftw
-abs_srcdir = /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/download/fftw
-abs_top_builddir = /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++
-abs_top_srcdir = /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++
-ac_ct_CC = gcc -Wl,-z,relro
+abs_builddir = /Users/hecht/work/ff++/download/fftw
+abs_srcdir = /Users/hecht/work/ff++/download/fftw
+abs_top_builddir = /Users/hecht/work/ff++
+abs_top_srcdir = /Users/hecht/work/ff++
+ac_ct_CC = clang -isysroot /Applications/Xcode.app//Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk
ac_ct_CXX =
-ac_ct_F77 = gfortran
-ac_ct_FC = gfortran
+ac_ct_F77 =
+ac_ct_FC =
am__include = include
am__leading_dot = .
am__quote =
am__tar = $${TAR-tar} chof - "$$tardir"
am__untar = $${TAR-tar} xf -
bindir = ${exec_prefix}/bin
-build = x86_64-pc-linux-gnu
-build_alias = x86_64-linux-gnu
-build_cpu = x86_64
-build_os = linux-gnu
-build_vendor = pc
+build = i686-apple-darwin13.0.0
+build_alias =
+build_cpu = i686
+build_os = darwin13.0.0
+build_vendor = apple
builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
@@ -335,33 +308,33 @@ ff_makeindex = yes
ff_patch = yes
ff_pdf2ps = yes
ff_pdflatex = yes
-ff_prefix_dir = /usr/lib/ff++/3.26-2
+ff_prefix_dir = /usr/local/lib/ff++/3.26-2
ff_unzip =
ff_wget = yes
-host = x86_64-pc-linux-gnu
+host = i686-apple-darwin13.0.0
host_alias =
-host_cpu = x86_64
-host_os = linux-gnu
-host_vendor = pc
+host_cpu = i686
+host_os = darwin13.0.0
+host_vendor = apple
htmldir = ${docdir}
includedir = ${prefix}/include
-infodir = ${prefix}/share/info
-install_sh = ${SHELL} /home/eftaxiop/Αρχεία/Γενικά/Λογισμικό/freefem++/Δημιουργία_πακέτου_για_το_Debian_Linux/freefem++/install-sh
-libdir = ${prefix}/lib/x86_64-linux-gnu
-libexecdir = ${prefix}/lib/x86_64-linux-gnu
+infodir = ${datarootdir}/info
+install_sh = ${SHELL} /Users/hecht/work/ff++/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
-localstatedir = /var
-mandir = ${prefix}/share/man
+localstatedir = ${prefix}/var
+mandir = ${datarootdir}/man
mkdir_p = $(MKDIR_P)
oldincludedir = /usr/include
pdfdir = ${docdir}
-prefix = /usr
+prefix = /usr/local
program_transform_name = s,x,x,
psdir = ${docdir}
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
srcdir = .
-sysconfdir = /etc
+sysconfdir = ${prefix}/etc
target_alias =
top_build_prefix = ../../
top_builddir = ../..
@@ -378,7 +351,7 @@ THIS = fftw3
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -403,9 +376,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: # $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
tags TAGS:
diff --git a/download/gmm/cxxflags b/download/gmm/cxxflags
index 2ad8048..b379501 100644
--- a/download/gmm/cxxflags
+++ b/download/gmm/cxxflags
@@ -1,12 +1,12 @@
-CXX = g++ -Wl,-z,relro
-MPICXX = mpic++ -Wl,-z,relro
+CXX = clang++ -std=c++11 -isysroot /Applications/Xcode.app//Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk
+MPICXX =
ac_ct_CXX =
-CC = gcc -Wl,-z,relro
-MPICC = /usr/bin/mpicc
+CC = clang -isysroot /Applications/Xcode.app//Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk
+MPICC =
YACC = bison -y
-ac_ct_CC = gcc -Wl,-z,relro
-CXXFLAGS = -g -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -DNDEBUG -O3 -mmmx -msse -msse2 -DBAMG_LONG_LONG -DNCHECKPTR -fPIC
-CFLAGS = -g -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
+ac_ct_CC = clang -isysroot /Applications/Xcode.app//Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk
+CXXFLAGS = -m64 -fPIC -g -DBAMG_LONG_LONG -DCHECK_KN -fno-inline -fexceptions -fPIC
+CFLAGS = -g -m64 -fPIC -g -fPIC
FCFLAGS = -g -O2 -fPIC
FFMETIS_CFLAGS =
WGET = wget --no-check-certificate
diff --git a/examples++-3d/all.edp b/examples++-3d/all.edp
index 8899490..d3677d2 100644
--- a/examples++-3d/all.edp
+++ b/examples++-3d/all.edp
@@ -7,97 +7,105 @@ verbosity=verbosityy;searchMethod=0;
verbosity=verbosityy;searchMethod=0;
{ include "ArrayFE-3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : beam-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : EqPoisson.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "beam-3d.edp";};
+{ include "EqPoisson.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : cone.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Lac.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "cone.edp";};
+{ include "Lac.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : convect-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Laplace-Adapt-3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "convect-3d.edp";};
+{ include "Laplace-Adapt-3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : cube-period.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Laplace-Adapt-aniso-3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "cube-period.edp";};
+{ include "Laplace-Adapt-aniso-3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : cylinder-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Laplace3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "cylinder-3d.edp";};
+{ include "Laplace3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : cylinder.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : LaplaceRT-3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "cylinder.edp";};
+{ include "LaplaceRT-3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : EqPoisson.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : NSI3d-carac.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "EqPoisson.edp";};
+{ include "NSI3d-carac.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : fallingspheres.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : NSI3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "fallingspheres.edp";};
+{ include "NSI3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : first.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Period-Poisson-cube-ballon.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "first.edp";};
+{ include "Period-Poisson-cube-ballon.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Lac.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Poisson-cube-ballon.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Lac.edp";};
+{ include "Poisson-cube-ballon.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Laplace3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Poisson.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Laplace3d.edp";};
+{ include "Poisson.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Laplace-Adapt-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Poisson3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Laplace-Adapt-3d.edp";};
+{ include "Poisson3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Laplace-Adapt-aniso-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Stokes.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Laplace-Adapt-aniso-3d.edp";};
+{ include "Stokes.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : LaplaceRT-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : TruncLac.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "LaplaceRT-3d.edp";};
+{ include "TruncLac.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : meditddm.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : beam-3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "meditddm.edp";};
+{ include "beam-3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : NSI3d-carac.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : cone.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "NSI3d-carac.edp";};
+{ include "cone.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : NSI3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : convect-3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "NSI3d.edp";};
+{ include "convect-3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : p.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : cube-period.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "p.edp";};
+{ include "cube-period.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : periodic-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : cylinder-3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "periodic-3d.edp";};
+{ include "cylinder-3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Period-Poisson-cube-ballon.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : cylinder.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Period-Poisson-cube-ballon.edp";};
+{ include "cylinder.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Poisson3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : fallingspheres.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Poisson3d.edp";};
+{ include "fallingspheres.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Poisson-cube-ballon.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : first.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Poisson-cube-ballon.edp";};
+{ include "first.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Poisson.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : meditddm.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Poisson.edp";};
+{ include "meditddm.edp";};
+ cout << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : p.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "p.edp";};
+ cout << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : periodic-3d.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "periodic-3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : pyramide.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
@@ -119,10 +127,6 @@ verbosity=verbosityy;searchMethod=0;
verbosity=verbosityy;searchMethod=0;
{ include "sphere6.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Stokes.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;searchMethod=0;
-{ include "Stokes.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : tetgencube.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
{ include "tetgencube.edp";};
@@ -131,7 +135,3 @@ verbosity=verbosityy;searchMethod=0;
verbosity=verbosityy;searchMethod=0;
{ include "tetgenholeregion.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : TruncLac.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;searchMethod=0;
-{ include "TruncLac.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
diff --git a/src/fflib/strversionnumber.cpp b/src/fflib/strversionnumber.cpp
index 5594487..592c068 100644
--- a/src/fflib/strversionnumber.cpp
+++ b/src/fflib/strversionnumber.cpp
@@ -18,6 +18,6 @@ string StrVersionNumber(){
// buffer.precision(8);
// buffer<<VersionNumber();
static char buffer[100];
- sprintf(buffer," %9f (date Κυρ 15 Δεκ 2013 11:57:21 μμ EET)",VersionNumber());
- return buffer; //.str()+" (date Κυρ 15 Δεκ 2013 11:57:21 μμ EET)" ;
+ sprintf(buffer," %9f (date Jeu 28 nov 2013 11:11:34 CET)",VersionNumber());
+ return buffer; //.str()+" (date Jeu 28 nov 2013 11:11:34 CET)" ;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freefempp.git
More information about the debian-science-commits
mailing list