diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2013-05-29 22:48:11 +0200 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2013-05-29 22:48:11 +0200 |
| commit | 2dd95f8ef64dd68b2acf55c1d1b98637fbb98903 (patch) | |
| tree | dc679c916c81a250393d90664c703b5bc761df2e | |
| parent | 97ad0a4e3c2ce94602d0f1fa4c58c60959e069d5 (diff) | |
| download | apache2-2dd95f8ef64dd68b2acf55c1d1b98637fbb98903.tar.gz | |
Fix FTBFS on hurd
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | debian/rules | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 211118c3..10c0a160 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apache2 (2.4.4-4) UNRELEASED; urgency=low + + * Fix FTBFS on hurd caused by mpm-itk linking fix. + + -- Stefan Fritsch <sf@debian.org> Wed, 29 May 2013 22:47:31 +0200 + apache2 (2.4.4-3) experimental; urgency=low [ Arno Töll ] diff --git a/debian/rules b/debian/rules index c9cf9fc2..228701c4 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f # -*- makefile -*- +DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) # Uncomment this to turn on verbose mode. # export DH_VERBOSE=1 @@ -85,9 +86,11 @@ override_dh_auto_configure: generate-maintainer-scripts prebuild-checks server/m --enable-mods-static="unixd logio watchdog version" \ CFLAGS="$(AP2_CFLAGS)" CPPFLAGS="$(AP2_CPPFLAGS)" LDFLAGS="$(AP2_LDFLAGS)" \ $(AP2_EXTRAFLAGS) +ifneq (hurd, $(DEB_BUILD_ARCH_OS)) # XXX Hack to make mod_mpm_itk.so link against libcap until we # XXX move itk to a separate package perl -p -i -e 's/(-avoid-version)/$$1 -lcap/' server/mpm/itk/modules.mk +endif override_dh_install: clean-config-vars prepare-scripts dh_install --list-missing |