diff options
| author | Joachim Breitner <mail@joachim-breitner.de> | 2015-04-30 10:08:36 +0300 |
|---|---|---|
| committer | Joachim Breitner <mail@joachim-breitner.de> | 2015-04-30 10:08:36 +0300 |
| commit | a89e063df43592433a08c98aba252dcc944d8871 (patch) | |
| tree | 1de0fe5940a97c5e258d6bad7ff8690ce081a504 /p/ghc | |
| parent | 43ab914baec3f1dc84c1c6e66a47efe36926b0ae (diff) | |
| download | DHG_packages-a89e063df43592433a08c98aba252dcc944d8871.tar.gz | |
ghc: Apply all hacks for armel and armhf also on arm64
Diffstat (limited to 'p/ghc')
| -rw-r--r-- | p/ghc/debian/changelog | 1 | ||||
| -rw-r--r-- | p/ghc/debian/control | 6 | ||||
| -rwxr-xr-x | p/ghc/debian/rules | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog index 8edbe07b7..259fce2a5 100644 --- a/p/ghc/debian/changelog +++ b/p/ghc/debian/changelog @@ -2,6 +2,7 @@ ghc (7.8.4-2) UNRELEASED; urgency=medium * Fix debian/rules syntax (tab instead of spaces) to unbreak build on armel, armhf + * Apply all hacks for armel and armhf also on arm64 -- Joachim Breitner <nomeata@debian.org> Thu, 30 Apr 2015 09:06:53 +0200 diff --git a/p/ghc/debian/control b/p/ghc/debian/control index f5bfacf40..46d4367a0 100644 --- a/p/ghc/debian/control +++ b/p/ghc/debian/control @@ -13,13 +13,13 @@ Build-Depends: grep-dctrl, dh-autoreconf, autotools-dev, - llvm-3.4 [armel armhf], + llvm-3.4 [arm64 armel armhf], libffi-dev, pkg-config, xsltproc, docbook-xsl, docbook-xml, - binutils [armel armhf], + binutils [arm64 armel armhf], libncurses5-dev, dpkg-dev (>= 1.16.1.1) Build-Depends-Indep: @@ -33,7 +33,7 @@ Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/ghc Package: ghc Architecture: any -Depends: llvm-3.4 [armel armhf], gcc, libgmp-dev, libffi-dev, libbsd-dev, libc6-dev, libncurses5-dev, ${shlibs:Depends}, ${misc:Depends} +Depends: llvm-3.4 [arm64 armel armhf], gcc, libgmp-dev, libffi-dev, libbsd-dev, libc6-dev, libncurses5-dev, ${shlibs:Depends}, ${misc:Depends} Pre-Depends: dpkg (>= 1.16.1) Provides: haskell-compiler, ${provided-devs}, ${haskell:Provides}, ${ghci}, ghc-dynamic Replaces: ghc6 (<< 7), ghc-dynamic (<< 7.8) diff --git a/p/ghc/debian/rules b/p/ghc/debian/rules index 96173d12e..f245f267b 100755 --- a/p/ghc/debian/rules +++ b/p/ghc/debian/rules @@ -30,7 +30,7 @@ export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) # confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) #endif -ifneq (,$(findstring $(DEB_HOST_ARCH), armel armhf)) +ifneq (,$(findstring $(DEB_HOST_ARCH), arm64 armel armhf)) # Force use of a specific llvm package, the same version that ghc # depends (and build-depends) on. LLVM_PATH=/usr/lib/llvm-3.4/bin @@ -208,7 +208,7 @@ ifeq (YES,$(BUILD_HADDOCK_DOCS)) install -Dm 644 debian/index.html debian/tmp/usr/share/doc/ghc-doc/index.html endif -ifneq (,$(findstring $(DEB_HOST_ARCH), armel armhf)) +ifneq (,$(findstring $(DEB_HOST_ARCH), arm64 armel armhf)) # Ensure that the same llvm used to build ghc is used at runtime. sed -i "s,exec ,PATH=\"$(LLVM_PATH):\$$PATH\"\nexport PATH\nexec ," \ debian/tmp/usr/lib/ghc/bin/ghc-$(ProjectVersion) \ |