diff --git a/Makefile b/Makefile index d5eaab9..5b56c38 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PKG_NAME := stack -URL = https://github.com/commercialhaskell/stack/releases/download/v2.7.5/stack-2.7.5-linux-x86_64.tar.gz +URL = https://github.com/commercialhaskell/stack/releases/download/v2.9.3/stack-2.9.3-linux-x86_64.tar.gz ARCHIVES = include ../common/Makefile.common diff --git a/options.conf b/options.conf index 74fcd4f..bd57e60 100644 --- a/options.conf +++ b/options.conf @@ -1,6 +1,6 @@ [package] name = stack -url = https://github.com/commercialhaskell/stack/releases/download/v2.7.5/stack-2.7.5-linux-x86_64.tar.gz +url = https://github.com/commercialhaskell/stack/releases/download/v2.9.3/stack-2.9.3-linux-x86_64.tar.gz archives = giturl = https://github.com/commercialhaskell/stack.git domain = @@ -27,6 +27,8 @@ conservative_flags = false dev_requires_extras = false # pass -ffast-math to compiler fast-math = false +# compile full (traditional) debug info +full-debug-info = false # optimize build for speed over size funroll-loops = false # set flags to smallest -02 flags possible @@ -35,6 +37,8 @@ insecure_build = false keepstatic = false # do not require autostart subpackage no_autostart = false +# do not use the replacement pattern for file matching +no_glob = false # do not generate debuginfo for this package nodebug = false # disable stripping binaries diff --git a/release b/release index 3c03207..d6b2404 100644 --- a/release +++ b/release @@ -1 +1 @@ -18 +19 diff --git a/stack-2.9.3-linux-x86_64.tar.gz.asc b/stack-2.9.3-linux-x86_64.tar.gz.asc new file mode 100644 index 0000000..f4d7a24 --- /dev/null +++ b/stack-2.9.3-linux-x86_64.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEExXBVM9pPeNhmS13AV1FZaJvvtEIFAmOdANUACgkQV1FZaJvv +tEKO4wf+Ox7WSDN1TXnIyR5G2I2SzR7ZAXJxH2uDUjulr518IOU0obHUo/SSveRV +8hNp7nxHDesIhT00lIatXcy12lyDFJo4AvjFK3oVh9E+PJO5Eonta5lxcYU66Qrq +5GYorQRrFWK6BH22S/zA2LoL0vj9XFc+5b50eHcdNLjRHJOQtPF7FxbrAhHZ7pp0 +juVF0XROo8vJRrDBdWH3tCysx4qwnrfNV1d8PUGdVvHBG68p3AklhL6X4vDFyL0d +5qc6Nm3tT3y2s41jPDhF8pDyFR+9lIo3EzJHTDHvqKqUb/R8J0/U8J+BzDNFxH+D +BzJyqjMWEiD8WY7LUJ9LO2u4SNgfBQ== +=54di +-----END PGP SIGNATURE----- diff --git a/stack.spec b/stack.spec index ad3def2..b1cb949 100644 --- a/stack.spec +++ b/stack.spec @@ -5,16 +5,19 @@ # Source0 file verified with key 0x575159689BEFB442 (dev@fpcomplete.com) # Name : stack -Version : 2.7.5 -Release : 18 -URL : https://github.com/commercialhaskell/stack/releases/download/v2.7.5/stack-2.7.5-linux-x86_64.tar.gz -Source0 : https://github.com/commercialhaskell/stack/releases/download/v2.7.5/stack-2.7.5-linux-x86_64.tar.gz -Source1 : https://github.com/commercialhaskell/stack/releases/download/v2.7.5/stack-2.7.5-linux-x86_64.tar.gz.asc +Version : 2.9.3 +Release : 19 +URL : https://github.com/commercialhaskell/stack/releases/download/v2.9.3/stack-2.9.3-linux-x86_64.tar.gz +Source0 : https://github.com/commercialhaskell/stack/releases/download/v2.9.3/stack-2.9.3-linux-x86_64.tar.gz +Source1 : https://github.com/commercialhaskell/stack/releases/download/v2.9.3/stack-2.9.3-linux-x86_64.tar.gz.asc Summary : The Haskell Tool Stack Group : Development/Tools License : BSD-3-Clause Requires: stack-bin = %{version}-%{release} Requires: stack-license = %{version}-%{release} +# Suppress stripping binaries +%define __strip /bin/true +%define debug_package %{nil} Patch1: 0001-Add-Makefile-with-install-target.patch %description @@ -39,8 +42,8 @@ license components for the stack package. %prep -%setup -q -n stack-2.7.5-linux-x86_64 -cd %{_builddir}/stack-2.7.5-linux-x86_64 +%setup -q -n stack-2.9.3-linux-x86_64 +cd %{_builddir}/stack-2.9.3-linux-x86_64 %patch1 -p1 %build @@ -48,23 +51,23 @@ export http_proxy=http://127.0.0.1:9/ export https_proxy=http://127.0.0.1:9/ export no_proxy=localhost,127.0.0.1,0.0.0.0 export LANG=C.UTF-8 -export SOURCE_DATE_EPOCH=1646677193 +export SOURCE_DATE_EPOCH=1675289566 export GCC_IGNORE_WERROR=1 export AR=gcc-ar export RANLIB=gcc-ranlib export NM=gcc-nm -export CFLAGS="$CFLAGS -O3 -ffat-lto-objects -flto=auto " -export FCFLAGS="$FFLAGS -O3 -ffat-lto-objects -flto=auto " -export FFLAGS="$FFLAGS -O3 -ffat-lto-objects -flto=auto " -export CXXFLAGS="$CXXFLAGS -O3 -ffat-lto-objects -flto=auto " +export CFLAGS="$CFLAGS -O3 -fdebug-types-section -femit-struct-debug-baseonly -ffat-lto-objects -flto=auto -g1 -gno-column-info -gno-variable-location-views -gz " +export FCFLAGS="$FFLAGS -O3 -fdebug-types-section -femit-struct-debug-baseonly -ffat-lto-objects -flto=auto -g1 -gno-column-info -gno-variable-location-views -gz " +export FFLAGS="$FFLAGS -O3 -fdebug-types-section -femit-struct-debug-baseonly -ffat-lto-objects -flto=auto -g1 -gno-column-info -gno-variable-location-views -gz " +export CXXFLAGS="$CXXFLAGS -O3 -fdebug-types-section -femit-struct-debug-baseonly -ffat-lto-objects -flto=auto -g1 -gno-column-info -gno-variable-location-views -gz " make %{?_smp_mflags} %install -export SOURCE_DATE_EPOCH=1646677193 +export SOURCE_DATE_EPOCH=1675289566 rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/package-licenses/stack -cp %{_builddir}/stack-2.7.5-linux-x86_64/LICENSE %{buildroot}/usr/share/package-licenses/stack/c2e88ce3ecac0bf589f7f22f56a78cdf7e026589 +cp %{_builddir}/stack-%{version}-linux-x86_64/LICENSE %{buildroot}/usr/share/package-licenses/stack/c2e88ce3ecac0bf589f7f22f56a78cdf7e026589 || : %make_install %files diff --git a/upstream b/upstream index 3ce9525..d24bb3a 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -a408e7a09eab8ef374625884e651d98bedb97875/stack-2.7.5-linux-x86_64.tar.gz +92595ff632c04ac1b26edbff244e3acc2bbe7892/stack-2.9.3-linux-x86_64.tar.gz diff --git a/versions b/versions index a603bb5..4db4b03 100644 --- a/versions +++ b/versions @@ -1 +1 @@ -2.7.5 +2.9.3