diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2015-05-01 13:53:53 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-05-01 13:54:25 +0200 |
| commit | 502a4e396488d8cd70342f4b28a95b2405183751 (patch) | |
| tree | 5bf1ddc0e794733570bab1b5e7c84fd111c7e56a | |
| parent | b2f7701332d704798d27b2c9b23b6ca1c187b4a5 (diff) | |
| download | tde-packaging-502a4e396488d8cd70342f4b28a95b2405183751.tar.gz tde-packaging-502a4e396488d8cd70342f4b28a95b2405183751.zip | |
Fix bibletime FTBFS on some 64bit architectures on Debian and Ubuntu
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 0c4195129ac05ce5ccaadbfba8b77cda643a3a75)
| -rwxr-xr-x | debian/lenny/applications/bibletime/debian/rules | 10 | ||||
| -rwxr-xr-x | debian/squeeze/applications/bibletime/debian/rules | 10 | ||||
| -rwxr-xr-x | ubuntu/maverick/applications/bibletime/debian/rules | 10 |
3 files changed, 30 insertions, 0 deletions
diff --git a/debian/lenny/applications/bibletime/debian/rules b/debian/lenny/applications/bibletime/debian/rules index 9e134b1f7..429e7e4fc 100755 --- a/debian/lenny/applications/bibletime/debian/rules +++ b/debian/lenny/applications/bibletime/debian/rules @@ -22,6 +22,16 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) + +ifneq (,$(filter powerpc64 ppc64el mips64,$(DEB_HOST_ARCH_CPU))) + # Fix "include/linux/types.h:148:1: error: unknown type name 'u32'". + # See linux commits: + # "asm/types.h: Remove include/asm-generic/int-l64.h" + # "powerpc: Add __SANE_USERSPACE_TYPES__ to asm/types.h for LL64" + CXXFLAGS += -D__SANE_USERSPACE_TYPES__ +endif + binary-install/bibletime-trinity:: chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/pics/* chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/bibletimeui.rc diff --git a/debian/squeeze/applications/bibletime/debian/rules b/debian/squeeze/applications/bibletime/debian/rules index eb2eab7e0..b385b43c7 100755 --- a/debian/squeeze/applications/bibletime/debian/rules +++ b/debian/squeeze/applications/bibletime/debian/rules @@ -22,6 +22,16 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) + +ifneq (,$(filter powerpc64 ppc64el mips64,$(DEB_HOST_ARCH_CPU))) + # Fix "include/linux/types.h:148:1: error: unknown type name 'u32'". + # See linux commits: + # "asm/types.h: Remove include/asm-generic/int-l64.h" + # "powerpc: Add __SANE_USERSPACE_TYPES__ to asm/types.h for LL64" + CXXFLAGS += -D__SANE_USERSPACE_TYPES__ +endif + binary-install/bibletime-trinity:: chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/pics/* chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/bibletimeui.rc diff --git a/ubuntu/maverick/applications/bibletime/debian/rules b/ubuntu/maverick/applications/bibletime/debian/rules index eb2eab7e0..b385b43c7 100755 --- a/ubuntu/maverick/applications/bibletime/debian/rules +++ b/ubuntu/maverick/applications/bibletime/debian/rules @@ -22,6 +22,16 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) + +ifneq (,$(filter powerpc64 ppc64el mips64,$(DEB_HOST_ARCH_CPU))) + # Fix "include/linux/types.h:148:1: error: unknown type name 'u32'". + # See linux commits: + # "asm/types.h: Remove include/asm-generic/int-l64.h" + # "powerpc: Add __SANE_USERSPACE_TYPES__ to asm/types.h for LL64" + CXXFLAGS += -D__SANE_USERSPACE_TYPES__ +endif + binary-install/bibletime-trinity:: chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/pics/* chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/bibletimeui.rc |