mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid building the webapp on Debian architectures that do not yet have template haskell and thus yesod. (Should be available for arm soonish I hope).

Browse source
This commit is contained in:
Joey Hess 2012-09-29 01:28:02 -04:00
parent b7df987adb
commit 5849c3f24b
4 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -7,7 +7,7 @@ BASEFLAGS=-threaded -Wall $(IGNORE) -outputdir $(GIT_ANNEX_TMP_BUILD_DIR) -IUtil
# you can turn off some of these features. # you can turn off some of these features.
# #
# If you're using an old version of yesod, enable -DWITH_OLD_YESOD # If you're using an old version of yesod, enable -DWITH_OLD_YESOD
FEATURES=$(GIT_ANNEX_LOCAL_FEATURES) -DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_PAIRING FEATURES?=-DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_PAIRING
bins=git-annex bins=git-annex
mans=git-annex.1 git-annex-shell.1 mans=git-annex.1 git-annex-shell.1

3
debian/changelog vendored
View file

@ -22,6 +22,9 @@ git-annex (3.20120925) UNRELEASED; urgency=low
GIT_ANNEX_LOCAL_FEATURES=-DWITH_OLD_YESOD GIT_ANNEX_LOCAL_FEATURES=-DWITH_OLD_YESOD
* copy: Avoid updating the location log when no copy is performed. * copy: Avoid updating the location log when no copy is performed.
* configure: Test that uuid -m works, falling back to plain uuid if not. * configure: Test that uuid -m works, falling back to plain uuid if not.
* Avoid building the webapp on Debian architectures that do not yet
have template haskell and thus yesod. (Should be available for arm soonish
I hope).
-- Joey Hess <joeyh@debian.org> Mon, 24 Sep 2012 19:58:07 -0400 -- Joey Hess <joeyh@debian.org> Mon, 24 Sep 2012 19:58:07 -0400

10
debian/control vendored
View file

@ -22,10 +22,11 @@ Build-Depends:
libghc-edit-distance-dev, libghc-edit-distance-dev,
libghc-hinotify-dev [linux-any], libghc-hinotify-dev [linux-any],
libghc-stm-dev (>= 2.3), libghc-stm-dev (>= 2.3),
libghc-dbus-dev, libghc-dbus-dev [linux-any],
libghc-yesod-dev, libghc-yesod-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64],
libghc-yesod-static-dev, libghc-yesod-static-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64],
libghc-yesod-default-dev, libghc-yesod-default-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64],
libghc-hamlet-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64],
libghc-case-insensitive-dev, libghc-case-insensitive-dev,
libghc-http-types-dev, libghc-http-types-dev,
libghc-transformers-dev, libghc-transformers-dev,
@ -35,7 +36,6 @@ Build-Depends:
libghc-blaze-builder-dev, libghc-blaze-builder-dev,
libghc-blaze-html-dev, libghc-blaze-html-dev,
libghc-crypto-api-dev, libghc-crypto-api-dev,
libghc-hamlet-dev,
libghc-clientsession-dev, libghc-clientsession-dev,
libghc-network-multicast-dev, libghc-network-multicast-dev,
libghc-network-info-dev, libghc-network-info-dev,

7
debian/rules vendored
View file

@ -1,6 +1,11 @@
#!/usr/bin/make -f #!/usr/bin/make -f
export GIT_ANNEX_LOCAL_FEATURES=-DWITH_OLD_YESOD ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
ifeq (install ok installed,$(shell dpkg-query -W -f '$${Status}' libghc-yesod-dev 2>/dev/null))
export FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_OLD_YESOD -DWITH_WEBAPP -DWITH_PAIRING
else
export FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_PAIRING
endif
%: %:
dh $@ dh $@