stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows package: when compiling slicot, use Makefile variables instead of patches

time-shift
Sébastien Villemot 2019-10-01 17:23:21 +02:00
parent 6a87779d9e
commit 8f8c83aa6a
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
7 changed files with 12 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
windows/deps/Makefile
View File

@ -52,70 +52,70 @@ sources32/slicot-$(SLICOT_VERSION)-without-underscore: tarballs/slicot-$(SLICOT_
rm -rf sources32/slicot-*-without-underscore
mkdir -p $@
tar xf $< --directory $@ --strip-components=1
patch $@/make.inc < patches/slicot-32-without-underscore.patch
touch $@
sources32/slicot-$(SLICOT_VERSION)-with-underscore: tarballs/slicot-$(SLICOT_VERSION).tar.gz
rm -rf sources32/slicot-*-with-underscore
mkdir -p $@
tar xf $< --directory $@ --strip-components=1
patch $@/make.inc < patches/slicot-32-with-underscore.patch
touch $@
sources64/slicot-$(SLICOT_VERSION)-with-32bit-integer: tarballs/slicot-$(SLICOT_VERSION).tar.gz
rm -rf sources64/slicot-*-with-32bit-integer
mkdir -p $@
tar xf $< --directory $@ --strip-components=1
patch $@/make.inc < patches/slicot-64-with-32bit-integer.patch
touch $@
sources64/slicot-$(SLICOT_VERSION)-with-64bit-integer: tarballs/slicot-$(SLICOT_VERSION).tar.gz
rm -rf sources64/slicot-*-with-64bit-integer
mkdir -p $@
tar xf $< --directory $@ --strip-components=1
patch $@/make.inc < patches/slicot-64-with-64bit-integer.patch
touch $@
sources64/slicot-$(SLICOT_VERSION)-with-32bit-integer-and-underscore: tarballs/slicot-$(SLICOT_VERSION).tar.gz
rm -rf sources64/slicot-*-with-32bit-integer-and-underscore
mkdir -p $@
tar xf $< --directory $@ --strip-components=1
patch $@/make.inc < patches/slicot-64-with-32bit-integer-and-underscore.patch
touch $@
sources64/slicot-$(SLICOT_VERSION)-with-64bit-integer-and-underscore: tarballs/slicot-$(SLICOT_VERSION).tar.gz
rm -rf sources64/slicot-*-with-64bit-integer-and-underscore
mkdir -p $@
tar xf $< --directory $@ --strip-components=1
patch $@/make.inc < patches/slicot-64-with-64bit-integer-and-underscore.patch
touch $@
lib32/Slicot/without-underscore/lib/libslicot_pic.a: sources32/slicot-$(SLICOT_VERSION)-without-underscore
make -C $< lib
make -C $< lib SLICOTLIB=../libslicot_pic.a OPTS="-O2 -g -fno-underscoring" FORTRAN=i686-w64-mingw32-gfortran LOADER=i686-w64-mingw32-gfortran ARCH=i686-w64-mingw32-ar
i686-w64-mingw32-strip --strip-debug $</libslicot_pic.a
mkdir -p $(dir $@)
cp $</libslicot_pic.a $@
lib32/Slicot/with-underscore/lib/libslicot_pic.a: sources32/slicot-$(SLICOT_VERSION)-with-underscore
make -C $< lib
make -C $< lib SLICOTLIB=../libslicot_pic.a OPTS="-O2 -g" FORTRAN=i686-w64-mingw32-gfortran LOADER=i686-w64-mingw32-gfortran ARCH=i686-w64-mingw32-ar
i686-w64-mingw32-strip --strip-debug $</libslicot_pic.a
mkdir -p $(dir $@)
cp $</libslicot_pic.a $@
lib64/Slicot/without-underscore/lib/libslicot_pic.a: sources64/slicot-$(SLICOT_VERSION)-with-32bit-integer
make -C $< lib
make -C $< lib SLICOTLIB=../libslicot_pic.a OPTS="-O2 -g -fno-underscoring" FORTRAN=x86_64-w64-mingw32-gfortran LOADER=x86_64-w64-mingw32-gfortran ARCH=x86_64-w64-mingw32-ar
x86_64-w64-mingw32-strip --strip-debug $</libslicot_pic.a
mkdir -p $(dir $@)
cp $</libslicot_pic.a $@
lib64/Slicot/without-underscore/lib/libslicot64_pic.a: sources64/slicot-$(SLICOT_VERSION)-with-64bit-integer
make -C $< lib
make -C $< lib SLICOTLIB=../libslicot64_pic.a OPTS="-O2 -g -fno-underscoring -fdefault-integer-8" FORTRAN=x86_64-w64-mingw32-gfortran LOADER=x86_64-w64-mingw32-gfortran ARCH=x86_64-w64-mingw32-ar
x86_64-w64-mingw32-strip --strip-debug $</libslicot64_pic.a
mkdir -p $(dir $@)
cp $</libslicot64_pic.a $@
lib64/Slicot/with-underscore/lib/libslicot_pic.a: sources64/slicot-$(SLICOT_VERSION)-with-32bit-integer-and-underscore
make -C $< lib
make -C $< lib SLICOTLIB=../libslicot_pic.a OPTS="-O2 -g" FORTRAN=x86_64-w64-mingw32-gfortran LOADER=x86_64-w64-mingw32-gfortran ARCH=x86_64-w64-mingw32-ar
x86_64-w64-mingw32-strip --strip-debug $</libslicot_pic.a
mkdir -p $(dir $@)
cp $</libslicot_pic.a $@
lib64/Slicot/with-underscore/lib/libslicot64_pic.a: sources64/slicot-$(SLICOT_VERSION)-with-64bit-integer-and-underscore
make -C $< lib
make -C $< lib SLICOTLIB=../libslicot64_pic.a OPTS="-O2 -g -fdefault-integer-8" FORTRAN=x86_64-w64-mingw32-gfortran LOADER=x86_64-w64-mingw32-gfortran ARCH=x86_64-w64-mingw32-ar
x86_64-w64-mingw32-strip --strip-debug $</libslicot64_pic.a
mkdir -p $(dir $@)
cp $</libslicot64_pic.a $@

30
windows/deps/patches/slicot-32-with-underscore.patch
View File

@ -1,30 +0,0 @@
--- make.inc 2012-01-19 20:51:25.000000000 +0100
+++ slicot-32-with-underscore.inc 2016-09-18 15:39:53.403237169 +0200
@@ -16,16 +16,16 @@
# selected. Define LOADER and LOADOPTS to refer to the loader and
# desired load options for your machine.
#
-FORTRAN = f77
-OPTS = -O4 -native -u
+FORTRAN = i686-w64-mingw32-gfortran
+OPTS = -O2 -g
NOOPT = -u
-LOADER = f77
+LOADER = i686-w64-mingw32-gfortran
LOADOPTS = $(SLICOTLIB) $(LPKAUXLIB) $(LAPACKLIB)
#
# The archiver and the flag(s) to use when building archive (library)
# If your system has no ranlib, set RANLIB = echo.
#
-ARCH = ar
+ARCH = i686-w64-mingw32-ar
ARCHFLAGS= r
# ARCHFLAGS= cr
# RANLIB = ranlib
@@ -36,5 +36,5 @@
#
#BLASLIB = -L/software/lib
LAPACKLIB = -L/software/lib -llapack -lblas
-SLICOTLIB = ../slicot.a
+SLICOTLIB = ../libslicot_pic.a
LPKAUXLIB = ../lpkaux.a

30
windows/deps/patches/slicot-32-without-underscore.patch
View File

@ -1,30 +0,0 @@
--- make.inc 2012-01-19 20:51:25.000000000 +0100
+++ slicot-32-without-underscore.inc 2016-09-18 15:32:26.784187836 +0200
@@ -16,16 +16,16 @@
# selected. Define LOADER and LOADOPTS to refer to the loader and
# desired load options for your machine.
#
-FORTRAN = f77
-OPTS = -O4 -native -u
+FORTRAN = i686-w64-mingw32-gfortran
+OPTS = -O2 -g -fno-underscoring
NOOPT = -u
-LOADER = f77
+LOADER = i686-w64-mingw32-gfortran
LOADOPTS = $(SLICOTLIB) $(LPKAUXLIB) $(LAPACKLIB)
#
# The archiver and the flag(s) to use when building archive (library)
# If your system has no ranlib, set RANLIB = echo.
#
-ARCH = ar
+ARCH = i686-w64-mingw32-ar
ARCHFLAGS= r
# ARCHFLAGS= cr
# RANLIB = ranlib
@@ -36,5 +36,5 @@
#
#BLASLIB = -L/software/lib
LAPACKLIB = -L/software/lib -llapack -lblas
-SLICOTLIB = ../slicot.a
+SLICOTLIB = ../libslicot_pic.a
LPKAUXLIB = ../lpkaux.a

30
windows/deps/patches/slicot-64-with-32bit-integer-and-underscore.patch
View File

@ -1,30 +0,0 @@
--- make.inc 2012-01-19 20:51:25.000000000 +0100
+++ slicot-64-with-32bit-integer.inc 2016-09-18 15:39:22.022804314 +0200
@@ -16,16 +16,16 @@
# selected. Define LOADER and LOADOPTS to refer to the loader and
# desired load options for your machine.
#
-FORTRAN = f77
-OPTS = -O4 -native -u
+FORTRAN = x86_64-w64-mingw32-gfortran
+OPTS = -O2 -g
NOOPT = -u
-LOADER = f77
+LOADER = x86_64-w64-mingw32-gfortran
LOADOPTS = $(SLICOTLIB) $(LPKAUXLIB) $(LAPACKLIB)
#
# The archiver and the flag(s) to use when building archive (library)
# If your system has no ranlib, set RANLIB = echo.
#
-ARCH = ar
+ARCH = x86_64-w64-mingw32-ar
ARCHFLAGS= r
# ARCHFLAGS= cr
# RANLIB = ranlib
@@ -36,5 +36,5 @@
#
#BLASLIB = -L/software/lib
LAPACKLIB = -L/software/lib -llapack -lblas
-SLICOTLIB = ../slicot.a
+SLICOTLIB = ../libslicot_pic.a
LPKAUXLIB = ../lpkaux.a

30
windows/deps/patches/slicot-64-with-32bit-integer.patch
View File

@ -1,30 +0,0 @@
--- make.inc 2012-01-19 20:51:25.000000000 +0100
+++ slicot-64-with-32bit-integer.inc 2016-09-18 15:39:22.022804314 +0200
@@ -16,16 +16,16 @@
# selected. Define LOADER and LOADOPTS to refer to the loader and
# desired load options for your machine.
#
-FORTRAN = f77
-OPTS = -O4 -native -u
+FORTRAN = x86_64-w64-mingw32-gfortran
+OPTS = -O2 -g -fno-underscoring
NOOPT = -u
-LOADER = f77
+LOADER = x86_64-w64-mingw32-gfortran
LOADOPTS = $(SLICOTLIB) $(LPKAUXLIB) $(LAPACKLIB)
#
# The archiver and the flag(s) to use when building archive (library)
# If your system has no ranlib, set RANLIB = echo.
#
-ARCH = ar
+ARCH = x86_64-w64-mingw32-ar
ARCHFLAGS= r
# ARCHFLAGS= cr
# RANLIB = ranlib
@@ -36,5 +36,5 @@
#
#BLASLIB = -L/software/lib
LAPACKLIB = -L/software/lib -llapack -lblas
-SLICOTLIB = ../slicot.a
+SLICOTLIB = ../libslicot_pic.a
LPKAUXLIB = ../lpkaux.a

30
windows/deps/patches/slicot-64-with-64bit-integer-and-underscore.patch
View File

@ -1,30 +0,0 @@
--- make.inc 2012-01-19 20:51:25.000000000 +0100
+++ slicot-64-with-64bit-integer.inc 2016-09-18 15:39:09.142623934 +0200
@@ -16,16 +16,16 @@
# selected. Define LOADER and LOADOPTS to refer to the loader and
# desired load options for your machine.
#
-FORTRAN = f77
-OPTS = -O4 -native -u
+FORTRAN = x86_64-w64-mingw32-gfortran
+OPTS = -O2 -g -fdefault-integer-8
NOOPT = -u
-LOADER = f77
+LOADER = x86_64-w64-mingw32-gfortran
LOADOPTS = $(SLICOTLIB) $(LPKAUXLIB) $(LAPACKLIB)
#
# The archiver and the flag(s) to use when building archive (library)
# If your system has no ranlib, set RANLIB = echo.
#
-ARCH = ar
+ARCH = x86_64-w64-mingw32-ar
ARCHFLAGS= r
# ARCHFLAGS= cr
# RANLIB = ranlib
@@ -36,5 +36,5 @@
#
#BLASLIB = -L/software/lib
LAPACKLIB = -L/software/lib -llapack -lblas
-SLICOTLIB = ../slicot.a
+SLICOTLIB = ../libslicot64_pic.a
LPKAUXLIB = ../lpkaux.a

30
windows/deps/patches/slicot-64-with-64bit-integer.patch
View File

@ -1,30 +0,0 @@
--- make.inc 2012-01-19 20:51:25.000000000 +0100
+++ slicot-64-with-64bit-integer.inc 2016-09-18 15:39:09.142623934 +0200
@@ -16,16 +16,16 @@
# selected. Define LOADER and LOADOPTS to refer to the loader and
# desired load options for your machine.
#
-FORTRAN = f77
-OPTS = -O4 -native -u
+FORTRAN = x86_64-w64-mingw32-gfortran
+OPTS = -O2 -g -fno-underscoring -fdefault-integer-8
NOOPT = -u
-LOADER = f77
+LOADER = x86_64-w64-mingw32-gfortran
LOADOPTS = $(SLICOTLIB) $(LPKAUXLIB) $(LAPACKLIB)
#
# The archiver and the flag(s) to use when building archive (library)
# If your system has no ranlib, set RANLIB = echo.
#
-ARCH = ar
+ARCH = x86_64-w64-mingw32-ar
ARCHFLAGS= r
# ARCHFLAGS= cr
# RANLIB = ranlib
@@ -36,5 +36,5 @@
#
#BLASLIB = -L/software/lib
LAPACKLIB = -L/software/lib -llapack -lblas
-SLICOTLIB = ../slicot.a
+SLICOTLIB = ../libslicot64_pic.a
LPKAUXLIB = ../lpkaux.a