diff options
| -rw-r--r-- | debian/rules.defs | 15 | ||||
| -rw-r--r-- | debian/rules2 | 32 |
2 files changed, 36 insertions, 11 deletions
diff --git a/debian/rules.defs b/debian/rules.defs index 220221b..fccfcbc 100644 --- a/debian/rules.defs +++ b/debian/rules.defs @@ -265,11 +265,14 @@ envfilt = $(strip $(or $(call lfilt,$(1),$(2)),$(call nlfilt,$(1),$(3)),$(call w # FIXME: libjava is not ported for thumb, this hack only works for # separate gcj builds ifeq (,$(findstring gcj,$(PKGSOURCE))) - ifeq ($(distribution),Ubuntu) - with_arm_thumb := yes - endif ifeq ($(DEB_TARGET_ARCH),armhf) with_arm_thumb := yes + else + ifeq ($(distribution)-$(DEB_TARGET_ARCH),Ubuntu-armel) + ifneq (,$(filter $(distrelease),lucid maverick natty oneiric precise)) + with_arm_thumb := yes + endif + endif endif endif @@ -286,7 +289,11 @@ endif ifeq ($(DEB_TARGET_ARCH),armhf) float_abi := hard else ifneq (,$(filter $(distribution)-$(DEB_TARGET_ARCH), Ubuntu-armel)) - float_abi := softfp + ifneq (,$(filter $(distrelease),lucid maverick natty oneiric precise)) + float_abi := softfp + else + float_abi := soft + endif else ifneq (,$(filter $(DEB_TARGET_ARCH), arm armel)) float_abi := soft endif diff --git a/debian/rules2 b/debian/rules2 index d158f15..53b7999 100644 --- a/debian/rules2 +++ b/debian/rules2 @@ -351,18 +351,36 @@ ifneq (,$(findstring arm, $(DEB_TARGET_GNU_CPU))) CONFARGS += --disable-sjlj-exceptions # FIXME: libjava is not ported for thumb, this hack only works for # separate gcj builds - # any Ubuntu arch or Debian armhf arch - ifneq (,$(filter Ubuntu-% Debian-armhf,$(distribution)-$(DEB_TARGET_ARCH))) + ifneq (,$(filter armhf,$(DEB_TARGET_ARCH))) ifneq (,$(findstring gcj,$(PKGSOURCE))) - CONFARGS += --with-arch=armv6 + with_arm_arch = armv6 else - CONFARGS += --with-arch=armv7-a + with_arm_arch = armv7-a endif - CONFARGS += --with-float=$(float_abi) --with-fpu=vfpv3-d16 + with_arm_fpu = vfpv3-d16 else - # Debian armel - CONFARGS += --with-arch=armv4t --with-float=$(float_abi) + # armel + ifeq ($(distribution),Debian) + with_arm_arch = armv4t + else ifneq (,$(filter $(distrelease),karmic)) + with_arm_arch = armv6 + with_arm_fpu = vfpv3-d16 + else ifneq (,$(filter $(distrelease),lucid maverick natty oneiric precise)) + ifneq (,$(findstring gcj,$(PKGSOURCE))) + with_arm_arch = armv6 + else + with_arm_arch = armv7-a + endif + with_arm_fpu = vfpv3-d16 + else + with_arm_arch = armv5t # starting with quantal + endif + endif + CONFARGS += --with-arch=$(with_arm_arch) + ifneq (,$(with_arm_fpu)) + CONFARGS += --with-fpu=$(with_arm_fpu) endif + CONFARGS += --with-float=$(float_abi) ifeq ($(with_arm_thumb),yes) CONFARGS += --with-mode=thumb endif |