From d37d6b22b4b33398c366ef66e733f639b12b2ccf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 21 Nov 2016 22:25:12 +0100 Subject: DEB bibletime: Test for __SANE_USERSPACE_TYPES__ is no longer needed in rules This reverts commit 502a4e396488d8cd70342f4b28a95b2405183751. --- debian/lenny/applications/bibletime/debian/rules | 10 ---------- debian/squeeze/applications/bibletime/debian/rules | 10 ---------- ubuntu/maverick/applications/bibletime/debian/rules | 10 ---------- 3 files changed, 30 deletions(-) diff --git a/debian/lenny/applications/bibletime/debian/rules b/debian/lenny/applications/bibletime/debian/rules index 429e7e4fc..9e134b1f7 100755 --- a/debian/lenny/applications/bibletime/debian/rules +++ b/debian/lenny/applications/bibletime/debian/rules @@ -22,16 +22,6 @@ 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 b385b43c7..eb2eab7e0 100755 --- a/debian/squeeze/applications/bibletime/debian/rules +++ b/debian/squeeze/applications/bibletime/debian/rules @@ -22,16 +22,6 @@ 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 b385b43c7..eb2eab7e0 100755 --- a/ubuntu/maverick/applications/bibletime/debian/rules +++ b/ubuntu/maverick/applications/bibletime/debian/rules @@ -22,16 +22,6 @@ 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 -- cgit v1.2.3