diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2017-09-04 17:07:20 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2017-09-04 17:07:20 -0700 |
| commit | aa90919fe9c78acf74371ce1e43757776c04b506 (patch) | |
| tree | 12d4588b511f7532a039eb71bdb8dc2e585d71c9 | |
| parent | 6a6c3858b47671f02f4f50ca2d6ab97d280a0f49 (diff) | |
Add 'static' Cabal flag, use it for linux statically linked.
| -rw-r--r-- | linux/Dockerfile | 10 | ||||
| -rw-r--r-- | pandoc.cabal | 7 |
2 files changed, 12 insertions, 5 deletions
diff --git a/linux/Dockerfile b/linux/Dockerfile index b725bbaa5..a8dc9bfd2 100644 --- a/linux/Dockerfile +++ b/linux/Dockerfile @@ -5,7 +5,7 @@ ADD https://raw.githubusercontent.com/mitchty/alpine-ghc/master/mitch.tishmack%4 /etc/apk/keys/mitch.tishmack@gmail.com-55881c97.rsa.pub RUN apk update RUN apk add alpine-sdk git ca-certificates ghc cabal stack zlib-dev \ - dpkg fakeroot sed gawk grep + dpkg fakeroot sed gawk grep llvm linux-headers RUN stack update RUN stack config set system-ghc --global true RUN mkdir -p /etc/stack @@ -16,13 +16,15 @@ RUN git clone https://github.com/jgm/pandoc WORKDIR /usr/src/pandoc RUN stack install --stack-yaml stack.pkg.yaml --only-dependencies \ --flag 'pandoc:embed_data_files' \ - --test --ghc-options '-O2 -optc-Os -optl-static -fPIC' \ + --ghc-options '-fPIC -fllvm' \ pandoc pandoc-citeproc CMD git pull && \ git checkout -b work $TREE && \ stack install --stack-yaml stack.pkg.yaml \ - --local-bin-path /artifacts --flag 'pandoc:embed_data_files' \ - --test --ghc-options '-O2 -optc-Os -optl-static -fPIC' \ + --flag 'pandoc:static' \ + --flag 'pandoc:embed_data_files' \ + --ghc-options '-fPIC -fllvm' \ + --local-bin-path /artifacts \ pandoc pandoc-citeproc && \ bash linux/make_deb.sh && \ bash linux/make_tarball.sh diff --git a/pandoc.cabal b/pandoc.cabal index 2228c7ff5..093c9196d 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -265,6 +265,10 @@ Source-repository head type: git location: git://github.com/jgm/pandoc.git +Flag static + Description: Use static linking for pandoc executable. + Default: False + Flag embed_data_files Description: Embed data files in binary for relocatable executable. Default: False @@ -483,7 +487,8 @@ Executable pandoc Build-Depends: pandoc, base >= 4.7 && < 5 Ghc-Options: -rtsopts -with-rtsopts=-K16m -Wall -fno-warn-unused-do-bind Ghc-Prof-Options: -fprof-auto-exported -rtsopts -with-rtsopts=-K16m - + if flag(static) + Ld-options: -static Default-Language: Haskell98 Other-Extensions: PatternGuards, OverloadedStrings, ScopedTypeVariables, GeneralizedNewtypeDeriving, |