diff options
author | François Andriot <[email protected]> | 2015-05-03 12:29:21 +0200 |
---|---|---|
committer | François Andriot <[email protected]> | 2015-05-03 12:29:21 +0200 |
commit | 2ea3a442e9ba2a4b527587320f61134008e83d31 (patch) | |
tree | 1736db84ad21b0b2fa723faefbab440d2db0f5e8 /ubuntu/maverick/applications/bibletime | |
parent | cc95c54618cf2d83930f6364bfbc19b1cfcd7b95 (diff) | |
parent | 0c4195129ac05ce5ccaadbfba8b77cda643a3a75 (diff) | |
download | tde-packaging-2ea3a442e9ba2a4b527587320f61134008e83d31.tar.gz tde-packaging-2ea3a442e9ba2a4b527587320f61134008e83d31.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/applications/bibletime')
-rwxr-xr-x | ubuntu/maverick/applications/bibletime/debian/rules | 10 |
1 files changed, 10 insertions, 0 deletions
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 |