diff options
| author | Vicente Olivert Riera <Vincent.Riera@imgtec.com> | 2015-11-27 13:54:28 +0000 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-11-27 19:28:45 +0100 |
| commit | 7a0d47340c963985b026fc050a3b26be1d3c154b (patch) | |
| tree | 7fca44378209c93f9f9527d5254dd16da3a3342d /package/mongrel2 | |
| parent | db80b0a5d6fe463d758b5413f2231f18bc38f100 (diff) | |
| download | buildroot-7a0d47340c963985b026fc050a3b26be1d3c154b.tar.gz buildroot-7a0d47340c963985b026fc050a3b26be1d3c154b.zip | |
mongrel2: disable polarssl assembly as we do in the polarssl package
Fixes:
http://autobuild.buildroot.net/results/a92292a1defd441938d3de6c5049473d520ebc4e/
http://autobuild.buildroot.net/results/f3db555dc29e0e0e87762fcace913853ffe2b176/
mongrel2 bundles polarssl so it has the same problem as the polarssl
with the assembly optimization, so let's use the same solution here.
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/mongrel2')
| -rw-r--r-- | package/mongrel2/mongrel2.mk | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/package/mongrel2/mongrel2.mk b/package/mongrel2/mongrel2.mk index 0be48327ac..d0640c9680 100644 --- a/package/mongrel2/mongrel2.mk +++ b/package/mongrel2/mongrel2.mk @@ -13,6 +13,21 @@ MONGREL2_LICENSE = BSD-3c MONGREL2_LICENSE_FILES = LICENSE MONGREL2_DEPENDENCIES = sqlite zeromq +define MONGREL2_POLARSSL_DISABLE_ASM + $(SED) '/^#define POLARSSL_HAVE_ASM/d' $(@D)/src/polarssl/include/polarssl/config.h +endef + +# ARM in thumb mode breaks debugging with asm optimizations +# Microblaze asm optimizations are broken in general +# MIPS R6 asm is not yet supported +ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THUMB2),yy) +MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM +else ifeq ($(BR2_microblaze),y) +MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM +else ifeq ($(BR2_mips_32r6)$(BR2_mips_64r6),y) +MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM +endif + define MONGREL2_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ PREFIX=/usr all |
