The package rpms/ghc-rpm-macros.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/ghc-rpm-macros.git/commit/?id=5b2544... https://src.fedoraproject.org/cgit/rpms/ghc-rpm-macros.git/commit/?id=d190fa....
Change: +%ifarch s390x\ -%ifarch aarch64 s390x\
Thanks.
Full change: ============
commit 4e2983c83c87a20c62c813691e2a759e6ad8b4dc Author: Jens Petersen petersen@redhat.com Date: Thu Oct 25 00:48:27 2018 +0900
disable -Werror=format-security too on s390x
cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security] cc1: some warnings being treated as errors `gcc' failed in phase `C Compiler'. (Exit code: 1)
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 3716fa7..43e63e2 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -11,7 +11,7 @@
Name: ghc-rpm-macros Version: 1.9.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: RPM macros for building Haskell packages for GHC
License: GPLv3+ @@ -175,6 +175,9 @@ EOF
%changelog +* Thu Oct 25 2018 Jens Petersen petersen@redhat.com - 1.9.5-5 +- need to disable -Werror=format-security too on s390x + * Wed Oct 24 2018 Jens Petersen petersen@redhat.com - 1.9.5-4 - silence C compiler Wunused-label warnings flood on s390x again
diff --git a/macros.ghc b/macros.ghc index 1e0dba9..b62f7f8 100644 --- a/macros.ghc +++ b/macros.ghc @@ -13,7 +13,7 @@ LANG=en_US.utf8\ %ghc_set_gcc_flags\ # -Wunused-label is extremely noisy\ %ifarch s390x\ -CFLAGS="${CFLAGS:-$(echo %optflags | sed -e 's/-Wall //')}"\ +CFLAGS="${CFLAGS:-$(echo %optflags | sed -e 's/-Wall //' -e 's/-Werror=format-security //')}"\ %else\ CFLAGS="${CFLAGS:-%optflags}"\ %endif\
commit 5b2544a8cce900ff62a9d1209edac849e8ab9e31 Author: Jens Petersen petersen@redhat.com Date: Thu Oct 25 00:12:12 2018 +0900
silence C Wunused-label warnings flood on s390x again
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index f7f6e38..3716fa7 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -11,7 +11,7 @@
Name: ghc-rpm-macros Version: 1.9.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: RPM macros for building Haskell packages for GHC
License: GPLv3+ @@ -175,6 +175,9 @@ EOF
%changelog +* Wed Oct 24 2018 Jens Petersen petersen@redhat.com - 1.9.5-4 +- silence C compiler Wunused-label warnings flood on s390x again + * Tue Oct 23 2018 Jens Petersen petersen@redhat.com - 1.9.5-3 - f29: obsolete content-store, bdcs, and bdcs-api
diff --git a/macros.ghc b/macros.ghc index 1dbeb50..1e0dba9 100644 --- a/macros.ghc +++ b/macros.ghc @@ -11,7 +11,13 @@ LANG=en_US.utf8\
%ghc_set_gcc_flags\ -export CFLAGS="${CFLAGS:-%optflags}"\ +# -Wunused-label is extremely noisy\ +%ifarch s390x\ +CFLAGS="${CFLAGS:-$(echo %optflags | sed -e 's/-Wall //')}"\ +%else\ +CFLAGS="${CFLAGS:-%optflags}"\ +%endif\ +export CFLAGS\ %global _hardened_ldflags %{nil}\ export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"\ %{nil}
commit 298bd4e3ddf2bdab9031d4eead402eff255f095e Author: Jens Petersen petersen@redhat.com Date: Tue Oct 23 16:07:55 2018 +0900
f29: obsolete content-store, bdcs, and bdcs-api
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 0181b52..f7f6e38 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -11,7 +11,7 @@
Name: ghc-rpm-macros Version: 1.9.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: RPM macros for building Haskell packages for GHC
License: GPLv3+ @@ -102,6 +102,11 @@ Obsoletes: ghc-webkit <= 0.14.2.1, ghc-webkit-devel <= 0.14.2.1 Obsoletes: ghc-fail < 4.9.0.0-2, ghc-fail-devel < 4.9.0.0-2 Obsoletes: ghc-ltk < 0.16, ghc-ltk-devel < 0.16 %endif +%if 0%{?fedora} >= 29 +Obsoletes: ghc-content-store < 0.2.1-3, ghc-content-store-devel < 0.2.1-3 +Obsoletes: ghc-bdcs < 0.6.1-3, ghc-bdcs-devel < 0.6.1-3 +Obsoletes: ghc-bdcs-api < 0.1.3-3, ghc-bdcs-api-devel < 0.1.3-3 +%endif
%description -n ghc-obsoletes Meta package for obsoleting deprecated Haskell packages. @@ -170,6 +175,9 @@ EOF
%changelog +* Tue Oct 23 2018 Jens Petersen petersen@redhat.com - 1.9.5-3 +- f29: obsolete content-store, bdcs, and bdcs-api + * Sat Oct 6 2018 Jens Petersen petersen@redhat.com - 1.9.5-2 - fix ghc_set_gcc_flags name
commit 59959cc216d32abfcbf5c390032380776d64cd6e Author: Jens Petersen petersen@redhat.com Date: Mon Oct 15 23:39:53 2018 +0900
tests: set SUDO for non-root
for containers running root
diff --git a/tests/test-rebuild.sh b/tests/test-rebuild.sh index 18d5bb7..6e2802a 100755 --- a/tests/test-rebuild.sh +++ b/tests/test-rebuild.sh @@ -47,8 +47,14 @@ fi
git pull
+if [ "$UID" != "0" ]; then + SUDO="sudo" +else + SUDO="" +fi + echo Running dnf builddep: -sudo dnf builddep $PKG.spec +$SUDO dnf builddep $PKG.spec
fedpkg local
@@ -62,7 +68,7 @@ PKGS=$(cd $ARCH; rpm -qp $(ls *-$VERREL*.rpm))
for i in $PKGS; do # FIXME: should check NVR is same before building - rpm -q --quiet $i || sudo dnf install -q $i + rpm -q --quiet $i || $SUDO dnf install -q $i for k in list requires provides scripts; do rpm -qp --$k $ARCH/$i.rpm | grep -v rpmlib > $TMP/$i.$k.test || : rpm -q --$k $i | grep -v rpmlib > $TMP/$i.$k.installed || :
commit 153f50041f7ec30c23f13d856860cbfe09e270fe Author: Jens Petersen petersen@redhat.com Date: Sat Oct 6 01:47:11 2018 +0900
keep %ghc_set_gcc_flags name
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index adf8772..0181b52 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -11,7 +11,7 @@
Name: ghc-rpm-macros Version: 1.9.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM macros for building Haskell packages for GHC
License: GPLv3+ @@ -170,6 +170,9 @@ EOF
%changelog +* Sat Oct 6 2018 Jens Petersen petersen@redhat.com - 1.9.5-2 +- fix ghc_set_gcc_flags name + * Sat Oct 6 2018 Jens Petersen petersen@redhat.com - 1.9.5-1 - disable hardened ldflags again
diff --git a/macros.ghc b/macros.ghc index 94e4303..1dbeb50 100644 --- a/macros.ghc +++ b/macros.ghc @@ -10,7 +10,7 @@ LANG=en_US.utf8\ %ghc_version %{!?ghc_version_override:%(ghc --numeric-version)}%{?ghc_version_override}
-%ghc_set_cflags\ +%ghc_set_gcc_flags\ export CFLAGS="${CFLAGS:-%optflags}"\ %global _hardened_ldflags %{nil}\ export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"\
commit 975f21c108fd37bf4d9d937d90abc569af4e706d Author: Jens Petersen petersen@redhat.com Date: Sat Oct 6 01:13:16 2018 +0900
disable hardened ldflags again
only breaks x86_64 and armv7hl for static linking?:
/usr/bin/ld.gold: error: /usr/lib64/ghc-8.2.2/rts/libHSrts_thr.a(MarkWeak.thr_o): requires unsupported dynamic reloc 11; recompile with -fPIC
/usr/bin/ld.gold: error: /usr/lib/ghc-8.2.2/rts/libHSrts_thr.a(GCUtils.thr_o): requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 29c80f6..adf8772 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -10,7 +10,7 @@ #%%global without_hscolour 1
Name: ghc-rpm-macros -Version: 1.9.4 +Version: 1.9.5 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC
@@ -170,6 +170,9 @@ EOF
%changelog +* Sat Oct 6 2018 Jens Petersen petersen@redhat.com - 1.9.5-1 +- disable hardened ldflags again + * Fri Oct 5 2018 Jens Petersen petersen@redhat.com - 1.9.4-1 - cabal_configure now uses ghc_set_gcc_flags
diff --git a/macros.ghc b/macros.ghc index d3712a2..94e4303 100644 --- a/macros.ghc +++ b/macros.ghc @@ -10,16 +10,15 @@ LANG=en_US.utf8\ %ghc_version %{!?ghc_version_override:%(ghc --numeric-version)}%{?ghc_version_override}
-%ghc_set_gcc_flags\ +%ghc_set_cflags\ export CFLAGS="${CFLAGS:-%optflags}"\ +%global _hardened_ldflags %{nil}\ export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"\ %{nil}
# configure %cabal_configure\ %ghc_set_gcc_flags\ -%global _hardened_ldflags %{nil}\ -LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"; export LDFLAGS\ if ! [ -f Setup.hs -o -f Setup.lhs ]; then\ cp %{_datadir}/ghc-rpm-macros/Setup.hs .\ fi\
commit 55f62273c3e4132b523c855aefaee2a65d374ea7 Author: Jens Petersen petersen@redhat.com Date: Fri Oct 5 19:02:12 2018 +0900
%cabal_configure: use %ghc_set_gcc_flags
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 9f526f3..29c80f6 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -10,8 +10,8 @@ #%%global without_hscolour 1
Name: ghc-rpm-macros -Version: 1.9.3 -Release: 2%{?dist} +Version: 1.9.4 +Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC
License: GPLv3+ @@ -170,6 +170,9 @@ EOF
%changelog +* Fri Oct 5 2018 Jens Petersen petersen@redhat.com - 1.9.4-1 +- cabal_configure now uses ghc_set_gcc_flags + * Fri Oct 5 2018 Jens Petersen petersen@redhat.com - 1.9.3-1 - disable dynamic linking of executables for better portability - replace ghc_set_cflags with simplified ghc_set_gcc_flags diff --git a/macros.ghc b/macros.ghc index 1a48dfc..d3712a2 100644 --- a/macros.ghc +++ b/macros.ghc @@ -17,7 +17,7 @@ export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"\
# configure %cabal_configure\ -%ghc_set_cflags\ +%ghc_set_gcc_flags\ %global _hardened_ldflags %{nil}\ LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"; export LDFLAGS\ if ! [ -f Setup.hs -o -f Setup.lhs ]; then\
commit 6499cbc4e2e0769d34bf17f328d7a2ae1498c6b9 Author: Jens Petersen petersen@redhat.com Date: Fri Oct 5 18:14:48 2018 +0900
bump for rebuild
for updated rawhide changelog
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 9877e06..9f526f3 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -11,7 +11,7 @@
Name: ghc-rpm-macros Version: 1.9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM macros for building Haskell packages for GHC
License: GPLv3+
commit e736d6cdbe357de6312e2f86b20acb574792f636 Author: Jens Petersen petersen@redhat.com Date: Fri Oct 5 18:12:30 2018 +0900
add important changelog entry for last commit
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 69f7896..9877e06 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -171,6 +171,7 @@ EOF
%changelog * Fri Oct 5 2018 Jens Petersen petersen@redhat.com - 1.9.3-1 +- disable dynamic linking of executables for better portability - replace ghc_set_cflags with simplified ghc_set_gcc_flags
* Tue Jul 31 2018 Jens Petersen petersen@redhat.com - 1.9.2-1
commit 7de08b499ae187cde1d9e27ecf42986161108bac Author: Jens Petersen petersen@redhat.com Date: Fri Oct 5 17:58:58 2018 +0900
disable dynamic linking of executables for better portability
diff --git a/macros.ghc b/macros.ghc index e67ba38..1a48dfc 100644 --- a/macros.ghc +++ b/macros.ghc @@ -2,7 +2,7 @@ # see https://fedoraproject.org/wiki/Packaging:Haskell for more details
# "cabal" -%cabal [ -x Setup ] || ghc --make %{!?ghc_user_conf:-no-user-package-db} %{!?ghc_without_dynamic:-dynamic} Setup\ +%cabal [ -x Setup ] || ghc --make %{!?ghc_user_conf:-no-user-package-db} %{!?ghc_static_setup:-dynamic} Setup\ LANG=en_US.utf8\ ./Setup
diff --git a/macros.ghc-os b/macros.ghc-os index e6ac90c..cdab44c 100644 --- a/macros.ghc-os +++ b/macros.ghc-os @@ -4,4 +4,6 @@
%_ghcdynlibdir %{_libdir}
+%ghc_without_dynamic 1 + %cabal_install_options -v
commit d190fa9b04536ab0c74f830493a867cfb29f7bad Author: Jens Petersen petersen@redhat.com Date: Fri Oct 5 17:53:41 2018 +0900
replace %ghc_set_cflags with simplified %ghc_set_gcc_flags
tested in ghc.spec in ghc:8.4 module
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 2fef7f3..69f7896 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -10,7 +10,7 @@ #%%global without_hscolour 1
Name: ghc-rpm-macros -Version: 1.9.2 +Version: 1.9.3 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC
@@ -170,6 +170,9 @@ EOF
%changelog +* Fri Oct 5 2018 Jens Petersen petersen@redhat.com - 1.9.3-1 +- replace ghc_set_cflags with simplified ghc_set_gcc_flags + * Tue Jul 31 2018 Jens Petersen petersen@redhat.com - 1.9.2-1 - inject a Setup.hs if none shipped
diff --git a/macros.ghc b/macros.ghc index 6313c1f..e67ba38 100644 --- a/macros.ghc +++ b/macros.ghc @@ -9,14 +9,10 @@ LANG=en_US.utf8\ # compiler version %ghc_version %{!?ghc_version_override:%(ghc --numeric-version)}%{?ghc_version_override}
-%ghc_set_cflags\ -# -Wunused-label is extremely noisy\ -%ifarch aarch64 s390x\ -CFLAGS="${CFLAGS:-$(echo %optflags | sed -e 's/-Wall //' -e 's/-Werror=format-security //')}"\ -%else\ -CFLAGS="${CFLAGS:-%optflags}"\ -%endif\ -export CFLAGS\ + +%ghc_set_gcc_flags\ +export CFLAGS="${CFLAGS:-%optflags}"\ +export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"\ %{nil}
# configure
commit 4972b52b10779a014784fac95a6322c358b03f47 Author: Jens Petersen petersen@redhat.com Date: Fri Aug 31 18:20:35 2018 +0900
tests: use dnf install and ignore /usr/lib/.build-id
diff --git a/tests/test-rebuild.sh b/tests/test-rebuild.sh index 973b9b3..18d5bb7 100755 --- a/tests/test-rebuild.sh +++ b/tests/test-rebuild.sh @@ -62,10 +62,10 @@ PKGS=$(cd $ARCH; rpm -qp $(ls *-$VERREL*.rpm))
for i in $PKGS; do # FIXME: should check NVR is same before building - rpm -q --quiet $i || sudo yum install -q $i + rpm -q --quiet $i || sudo dnf install -q $i for k in list requires provides scripts; do rpm -qp --$k $ARCH/$i.rpm | grep -v rpmlib > $TMP/$i.$k.test || : rpm -q --$k $i | grep -v rpmlib > $TMP/$i.$k.installed || : - diff -u $TMP/$i.$k.installed $TMP/$i.$k.test || : + diff -u $TMP/$i.$k.installed $TMP/$i.$k.test -I /usr/lib/.build-id || : done done
arch-excludes@lists.fedoraproject.org