From bda2b1a1e9395f53e06bfe56dc211c7bffab6e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org> Date: Wed, 30 Aug 2023 11:31:22 +0200 Subject: [PATCH] Windows and macOS packages, README.md: bump to x13as 1.1-b60 --- README.md | 10 +++++----- macOS/deps/versions.mk | 2 +- windows/deps/versions.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 3fa3c383ec..74668565e2 100644 --- a/README.md +++ b/README.md @@ -296,8 +296,8 @@ cp slicot.a /home/$USER/dynare/slicot/lib/libslicot_pic.a #for octave # compile x13as from source and put it into /usr/bin/ mkdir -p /home/$USER/dynare/x13as cd /home/$USER/dynare/x13as -wget https://www2.census.gov/software/x-13arima-seats/x13as/unix-linux/program-archives/x13as_asciisrc-v1-1-b59.tar.gz -tar xf x13as_asciisrc-v1-1-b59.tar.gz +wget https://www2.census.gov/software/x-13arima-seats/x13as/unix-linux/program-archives/x13as_asciisrc-v1-1-b60.tar.gz +tar xf x13as_asciisrc-v1-1-b60.tar.gz sed -i "s|-static| |" makefile.gf # this removes '-static' in the makefile.gf make -f makefile.gf FFLAGS="-O2 -std=legacy" PROGRAM=x13as sudo cp x13as /usr/bin/ @@ -503,8 +503,8 @@ cd $HOME/dynare ```sh mkdir -p $DYNAREDIR/x13as cd $DYNAREDIR/x13as -curl -O https://www2.census.gov/software/x-13arima-seats/x13as/unix-linux/program-archives/x13as_asciisrc-v1-1-b59.tar.gz -tar xf x13as_asciisrc-v1-1-b59.tar.gz +curl -O https://www2.census.gov/software/x-13arima-seats/x13as/unix-linux/program-archives/x13as_asciisrc-v1-1-b60.tar.gz +tar xf x13as_asciisrc-v1-1-b60.tar.gz sed -i '' 's/-static//g' makefile.gf make -j$(sysctl -n hw.ncpu) -f makefile.gf FC=$BREWDIR/bin/gfortran LINKER=$BREWDIR/bin/gcc-13 FFLAGS="-O2 -std=legacy" LDFLAGS=-static-libgcc LIBS="$BREWDIR/lib/gcc/current/libgfortran.a /$BREWDIR/lib/gcc/current/libquadmath.a" PROGRAM=x13as mkdir -p $HOME/.local/bin @@ -561,4 +561,4 @@ Last tested on: ## Docker We offer a variety of pre-configured Docker containers for Dynare, pre-configured with Octave and MATLAB including all recommended toolboxes. These are readily available for your convenience on [Docker Hub](https://hub.docker.com/r/dynare/dynare). -The docker folder contains [information and instructions](docker/README.md) to interact, built and customize the containers. \ No newline at end of file +The docker folder contains [information and instructions](docker/README.md) to interact, built and customize the containers. diff --git a/macOS/deps/versions.mk b/macOS/deps/versions.mk index b13cc880e9..5d0b1ab0cf 100644 --- a/macOS/deps/versions.mk +++ b/macOS/deps/versions.mk @@ -1,2 +1,2 @@ SLICOT_VERSION = 5.0+20101122 -X13AS_VERSION = 1-1-b59 +X13AS_VERSION = 1-1-b60 diff --git a/windows/deps/versions.mk b/windows/deps/versions.mk index 354bc47bbf..526873f62c 100644 --- a/windows/deps/versions.mk +++ b/windows/deps/versions.mk @@ -1,5 +1,5 @@ SLICOT_VERSION = 5.0+20101122 -X13AS_VERSION = 1-1-b59 +X13AS_VERSION = 1-1-b60 OCTAVE_VERSION = 8.3.0 OCTAVE_W64_BUILD = -- GitLab