use rpm fileattrs also for EPEL7
remove unused patch and changelog entry
This commit is contained in:
parent
60a180bd78
commit
ae6fe15573
|
@ -1,37 +0,0 @@
|
|||
From 08a38628f29df63ac842f4d083efb414f42d7bff Mon Sep 17 00:00:00 2001
|
||||
From: "Edward Z. Yang" <ezyang@mit.edu>
|
||||
Date: Tue, 9 Jul 2013 00:01:43 -0700
|
||||
Subject: [PATCH] Disable executable stack for the linker note, fixing #703
|
||||
(again)
|
||||
|
||||
Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
|
||||
---
|
||||
compiler/main/DriverPipeline.hs | 12 +++++++++++-
|
||||
1 file changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
|
||||
index 67377e6..26425ae 100644
|
||||
--- a/compiler/main/DriverPipeline.hs
|
||||
+++ b/compiler/main/DriverPipeline.hs
|
||||
@@ -1640,7 +1640,17 @@ mkNoteObjsToLinkIntoBinary dflags dep_packages = do
|
||||
text elfSectionNote,
|
||||
text "\n",
|
||||
|
||||
- text "\t.ascii \"", info', text "\"\n" ]
|
||||
+ text "\t.ascii \"", info', text "\"\n",
|
||||
+
|
||||
+ -- ALL generated assembly must have this section to disable
|
||||
+ -- executable stacks. See also
|
||||
+ -- compiler/nativeGen/AsmCodeGen.lhs for another instance
|
||||
+ -- where we need to do this.
|
||||
+ (if platformHasGnuNonexecStack (targetPlatform dflags)
|
||||
+ then text ".section .note.GNU-stack,\"\",@progbits\n"
|
||||
+ else empty)
|
||||
+
|
||||
+ ]
|
||||
where
|
||||
info' = text $ escape info
|
||||
|
||||
--
|
||||
1.8.1.2
|
||||
|
12
ghc.spec
12
ghc.spec
|
@ -22,7 +22,7 @@ Version: 7.6.3
|
|||
# - release can only be reset if *all* library versions get bumped simultaneously
|
||||
# (sometimes after a major release)
|
||||
# - minor release numbers for a branch should be incremented monotonically
|
||||
Release: 26.3%{?dist}
|
||||
Release: 26.4%{?dist}
|
||||
Summary: Glasgow Haskell Compiler
|
||||
|
||||
License: %BSDHaskellReport
|
||||
|
@ -196,8 +196,8 @@ documention.
|
|||
|
||||
%global ghc_version_override %{version}
|
||||
|
||||
# currently only F21+ ghc-rpm-macros has ghc.attr
|
||||
%if 0%{?fedora} < 21
|
||||
# EL7 rpm supports fileattrs ghc.attr
|
||||
%if 0%{?rhel} && 0%{?rhel} < 7
|
||||
# needs ghc_version_override for bootstrapping
|
||||
%global _use_internal_dependency_generator 0
|
||||
%global __find_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir}
|
||||
|
@ -560,6 +560,11 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Jun 9 2016 Jens Petersen <petersen@redhat.com> - 7.6.3-26.4
|
||||
- rebase 7.6.3-18.3 to F21 7.6.3-26.3 to allow building for aarch64 and ppc64le
|
||||
(#1200404)
|
||||
- use rpm fileattrs also for EPEL7
|
||||
|
||||
* Wed Dec 24 2014 Jens Petersen <petersen@redhat.com> - 7.6.3-26.3
|
||||
- remove the build hack to switch from llvm to llvm34 (#1161049)
|
||||
|
||||
|
@ -594,7 +599,6 @@ fi
|
|||
|
||||
-- 7.6.3-19
|
||||
- generate and ship library doc index for ghc bundled libraries
|
||||
- change ghc-cabal to make library html docdirs unversioned
|
||||
|
||||
* Wed Jan 29 2014 Jens Petersen <petersen@redhat.com> - 7.6.3-18.3
|
||||
- fix segfault on i686 when using ffi double-mapping for selinux (#907515)
|
||||
|
|
Loading…
Reference in New Issue