f9287b263f
Fix the following build failure raised since bump to version 5.6.5 in
commit 736932c715:
In file included from /home/buildroot/autobuild/instance-0/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/string.h:631:0,
from arg_check.c:31:
dmalloc.h:377:7: error: expected identifier or '(' before '__extension__'
char *strdup(const char *string);
^
This build failure is raised because 0004-fix-strdup.patch was wrongly
removed and because configure.ac wrongly assumes that strdup macro is
not available when cross-compiling
As configure.ac can't be patched because autoreconf is not working,
patch configure as already done in DMALLOC_POST_PATCH. An upstream patch
on configure.ac will be sent as soon as upstream merges this old PR:
https://github.com/j256/dmalloc/pull/44
Fixes:
- http://autobuild.buildroot.org/results/00565c4b0618ea5f553d8c22284637b6574e4a93
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
81 lines
2.1 KiB
Makefile
81 lines
2.1 KiB
Makefile
################################################################################
|
|
#
|
|
# dmalloc
|
|
#
|
|
################################################################################
|
|
|
|
DMALLOC_VERSION = 5.6.5
|
|
DMALLOC_SOURCE = dmalloc-$(DMALLOC_VERSION).tgz
|
|
DMALLOC_SITE = http://dmalloc.com/releases
|
|
|
|
DMALLOC_LICENSE = ISC
|
|
DMALLOC_LICENSE_FILES = LICENSE.txt
|
|
|
|
DMALLOC_INSTALL_STAGING = YES
|
|
DMALLOC_CFLAGS = $(TARGET_CFLAGS)
|
|
|
|
ifeq ($(BR2_STATIC_LIBS),y)
|
|
DMALLOC_CONF_OPTS += --disable-shlib
|
|
else
|
|
DMALLOC_CONF_OPTS += --enable-shlib
|
|
DMALLOC_CFLAGS += -fPIC
|
|
endif
|
|
|
|
ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
|
|
DMALLOC_CONF_OPTS += --enable-cxx
|
|
else
|
|
DMALLOC_CONF_OPTS += --disable-cxx
|
|
endif
|
|
|
|
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
|
DMALLOC_CONF_OPTS += --enable-threads
|
|
else
|
|
DMALLOC_CONF_OPTS += --disable-threads
|
|
endif
|
|
|
|
# dmalloc has some assembly function that are not present in thumb1 mode:
|
|
# Error: lo register required -- `str lr,[sp,#4]'
|
|
# so, we desactivate thumb mode
|
|
ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
|
|
DMALLOC_CFLAGS += -marm
|
|
endif
|
|
|
|
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_63261),y)
|
|
DMALLOC_CFLAGS += -O0
|
|
endif
|
|
|
|
DMALLOC_CONF_ENV = CFLAGS="$(DMALLOC_CFLAGS)"
|
|
|
|
define DMALLOC_POST_PATCH
|
|
$(SED) 's/^ac_cv_page_size=0$$/ac_cv_page_size=12/' $(@D)/configure
|
|
$(SED) 's/ac_cv_strdup_macro=no$$/ac_cv_strdup_macro=yes/' $(@D)/configure
|
|
$(SED) 's/(ld -/($${LD-ld} -/' $(@D)/configure
|
|
$(SED) 's/'\''ld -/"$${LD-ld}"'\'' -/' $(@D)/configure
|
|
$(SED) 's/ar cr/$$(AR) cr/' $(@D)/Makefile.in
|
|
endef
|
|
|
|
DMALLOC_POST_PATCH_HOOKS += DMALLOC_POST_PATCH
|
|
|
|
# both DESTDIR and PREFIX are ignored..
|
|
define DMALLOC_INSTALL_STAGING_CMDS
|
|
$(TARGET_MAKE_ENV) $(MAKE) includedir="$(STAGING_DIR)/usr/include" \
|
|
bindir="$(STAGING_DIR)/usr/bin" \
|
|
libdir="$(STAGING_DIR)/usr/lib" \
|
|
shlibdir="$(STAGING_DIR)/usr/lib" \
|
|
infodir="$(STAGING_DIR)/usr/share/info/" \
|
|
-C $(@D) install
|
|
endef
|
|
|
|
ifeq ($(BR2_STATIC_LIBS),)
|
|
define DMALLOC_INSTALL_SHARED_LIB
|
|
cp -dpf $(STAGING_DIR)/usr/lib/libdmalloc*.so $(TARGET_DIR)/usr/lib
|
|
endef
|
|
endif
|
|
|
|
define DMALLOC_INSTALL_TARGET_CMDS
|
|
$(DMALLOC_INSTALL_SHARED_LIB)
|
|
cp -dpf $(STAGING_DIR)/usr/bin/dmalloc $(TARGET_DIR)/usr/bin/dmalloc
|
|
endef
|
|
|
|
$(eval $(autotools-package))
|