Branch: master

d37d6b22 2016-11-21 15:25:12 Slávek Banko
DEB bibletime: Test for __SANE_USERSPACE_TYPES__ is no longer needed in rules
This reverts commit 502a4e396488d8cd70342f4b28a95b2405183751.
M debian/lenny/applications/bibletime/debian/rules
M debian/squeeze/applications/bibletime/debian/rules
M ubuntu/maverick/applications/bibletime/debian/rules
diff --git a/debian/lenny/applications/bibletime/debian/rules b/debian/lenny/applications/bibletime/debian/rules
index 429e7e4..9e134b1 100755
--- a/debian/lenny/applications/bibletime/debian/rules
+++ b/debian/lenny/applications/bibletime/debian/rules
@@ -22,16 +22,6 @@
 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 b385b43..eb2eab7 100755
--- a/debian/squeeze/applications/bibletime/debian/rules
+++ b/debian/squeeze/applications/bibletime/debian/rules
@@ -22,16 +22,6 @@
 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 b385b43..eb2eab7 100755
--- a/ubuntu/maverick/applications/bibletime/debian/rules
+++ b/ubuntu/maverick/applications/bibletime/debian/rules
@@ -22,16 +22,6 @@
 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