Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
GHC musl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Glasgow Haskell Compiler
GHC musl
Commits
8178a8c6
Commit
8178a8c6
authored
3 years ago
by
Olivier Benz
Browse files
Options
Downloads
Patches
Plain Diff
Update latest.Dockerfile
- Add patch for rts/RtsSymbols.c
parent
26b3b540
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
latest.Dockerfile
+5
-0
5 additions, 0 deletions
latest.Dockerfile
patches/ghc-9.2.1-RtsSymbols.patch
+22
-0
22 additions, 0 deletions
patches/ghc-9.2.1-RtsSymbols.patch
with
27 additions
and
0 deletions
latest.Dockerfile
+
5
−
0
View file @
8178a8c6
...
...
@@ -3,6 +3,8 @@ ARG CABAL_VERSION_BUILD
FROM
registry.gitlab.b-data.ch/ghc/ghc4pandoc:9.0.1
as
bootstrap
COPY
patches/* /tmp/
ENV
GHC_VERSION=${GHC_VERSION_BUILD:-9.2.1}
ENV
CABAL_VERSION=${CABAL_VERSION_BUILD:-3.6.0.0}
...
...
@@ -31,6 +33,9 @@ RUN cd /tmp \
&&
gpg
--verify
ghc-
$GHC_VERSION
-src
.tar.xz.sig ghc-
$GHC_VERSION
-src
.tar.xz
\
&&
tar
xf ghc-
$GHC_VERSION
-src
.tar.xz
\
&&
cd
ghc-
$GHC_VERSION
\
# Apply patches
&& mv /tmp/*.patch . \
&& patch -p0 <ghc-9.2.1-RtsSymbols.patch \
# Use the LLVM backend
&& cp mk/build.mk.sample mk/build.mk \
&& echo 'BuildFlavour=perf-llvm' >> mk/build.mk \
...
...
This diff is collapsed.
Click to expand it.
patches/ghc-9.2.1-RtsSymbols.patch
0 → 100644
+
22
−
0
View file @
8178a8c6
--- rts/RtsSymbols.c 2021-10-28 22:41:34.000000000 +0200
+++ rts/RtsSymbols.c.patched 2021-12-01 17:04:02.000000000 +0100
@@ -33,6 +33,11 @@
#include <elf.h> /* _DYNAMIC */
#endif
+/* We must provide a prototype for environ since depending upon the libc
+ * version it may or may not be provided by unistd.h. See #20577.
+ */
+extern char **environ;
+
/* -----------------------------------------------------------------------------
* Symbols to be inserted into the RTS symbol table.
*/
@@ -60,7 +65,6 @@
SymI_HasProto(stg_sig_install) \
SymI_HasProto(rtsTimerSignal) \
SymI_HasProto_redirect(atexit, atexit, STRENGTH_STRONG) /* See Note [Strong symbols] */ \
- SymI_NeedsDataProto(environ) \
SymI_NeedsDataProto(nocldstop)
#endif
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment