diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-07 16:55:09 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-07 16:55:09 +0100 |
| commit | b59da8fc7b46ee62cbe9eb97a05c8a0f1ab75593 (patch) | |
| tree | 693c02553b84749c1eef6323ff528850c46687f4 /mk | |
| parent | 08f64b87c0b6e9a6de7250c616a91830ef447713 (diff) | |
update valgrind to latest upstream version, strlen is not a function in ld.so in latest glibc/eglibc setups, just remove the redirect for now. enable automatic building of debug subpackages. update TODO
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/package.mk | 28 | ||||
| -rw-r--r-- | mk/vars.mk | 2 |
2 files changed, 29 insertions, 1 deletions
diff --git a/mk/package.mk b/mk/package.mk index 768ac0b89..b0733f481 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -120,30 +120,43 @@ PKGDESC_$(1)= $(5) PKGSECT_$(1)= $(6) IPKG_$(1)= $(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.${PKG_SUFFIX} IPKG_$(1)_DEV= $(PACKAGE_DIR)/$(2)-dev_$(3)_${CPU_ARCH}.${PKG_SUFFIX} +IPKG_$(1)_DBG= $(PACKAGE_DIR)/$(2)-dbg_$(3)_${CPU_ARCH}.${PKG_SUFFIX} IDIR_$(1)= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2) IDIR_$(1)_DEV= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)-dev +IDIR_$(1)_DBG= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)-dbg ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},) -ALL_IPKGS+= $$(IPKG_$(1)) +ALL_IDIRS+= $${IDIR_$(1)} ALL_IDIRS+= $${IDIR_$(1)} ALL_POSTINST+= $(2)-install $(2)-install: endif INFO_$(1)= $(PKG_STATE_DIR)/info/$(2).list INFO_$(1)_DEV= $(PKG_STATE_DIR)/info/$(2)-dev.list +INFO_$(1)_DBG= $(PKG_STATE_DIR)/info/$(2)-dbg.list ifeq ($(ADK_PACKAGE_$(1)),y) +ifeq ($(ADK_PACKAGE_$(1)_DBG),y) +install-targets: $$(INFO_$(1)) $$(INFO_$(1)_DBG) +ifeq ($(ADK_PACKAGE_$(1)_DEV),y) +install-targets: $$(INFO_$(1)) $$(INFO_$(1)_DBG) $$(INFO_$(1)_DEV) +else +install-targets: $$(INFO_$(1)) $$(INFO_$(1)_DBG) +endif +else ifeq ($(ADK_PACKAGE_$(1)_DEV),y) install-targets: $$(INFO_$(1)) $$(INFO_$(1)_DEV) else install-targets: $$(INFO_$(1)) endif endif +endif IDEPEND_$(1):= $$(strip $(4)) _ALL_CONTROLS+= $$(IDIR_$(1))/CONTROL/control ICONTROL_$(1)?= $(WRKDIR)/.$(2).control ICONTROL_$(1)_DEV?= $(WRKDIR)/.$(2)-dev.control +ICONTROL_$(1)_DBG?= $(WRKDIR)/.$(2)-dbg.control $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE} @echo "Package: $$(shell echo $(2) | tr '_' '-')" > $(WRKDIR)/.$(2).control @echo "Section: $(6)" >> $(WRKDIR)/.$(2).control @@ -167,6 +180,13 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE} @for file in conffiles preinst postinst prerm postrm; do \ [ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \ done +ifneq ($(ADK_DEBUG),y) + @echo "Package: $$(shell echo $(2) | tr '_' '-')-dbg" > $(WRKDIR)/.$(2)-dbg.control + @echo "Section: debug" >> $(WRKDIR)/.$(2)-dbg.control + @echo "Description: debugging symbols for $(2)" >> $(WRKDIR)/.$(2)-dbg.control + @${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)_DBG} $${ICONTROL_$(1)_DBG} $(3) ${CPU_ARCH} + @echo "Depends: $$(shell echo $(2) | tr '_' '-')" >> $${IDIR_$(1)_DBG}/CONTROL/control +endif ifneq (,$(filter dev,$(7))) @echo "Package: $$(shell echo $(2) | tr '_' '-')-dev" > $(WRKDIR)/.$(2)-dev.control @echo "Section: devel" >> $(WRKDIR)/.$(2)-dev.control @@ -247,6 +267,9 @@ ifeq (,$(filter libmix,$(7))) ifeq (,$(filter libonly,$(7))) ifeq (,$(filter devonly,$(7))) $${PKG_BUILD} $${IDIR_$(1)} $${PACKAGE_DIR} $(MAKE_TRACE) +ifneq ($(ADK_DEBUG),y) + $${PKG_BUILD} $${IDIR_$(1)_DBG} $${PACKAGE_DIR} $(MAKE_TRACE) +endif endif endif endif @@ -270,6 +293,9 @@ endif $$(INFO_$(1)): $$(IPKG_$(1)) $(PKG_INSTALL) $$(IPKG_$(1)) +$$(INFO_$(1)_DBG): $$(IPKG_$(1)_DBG) + $(PKG_INSTALL) $$(IPKG_$(1)_DBG) + ifneq ($(1),UCLIBC) ifneq ($(1),EGLIBC) ifneq ($(1),GLIBC) diff --git a/mk/vars.mk b/mk/vars.mk index bb7bd52b9..e7a130e8c 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -132,6 +132,8 @@ TARGET_CPPFLAGS+= -DNDEBUG TARGET_CFLAGS+= -fomit-frame-pointer $(TARGET_OPTIMIZATION) # stop generating eh_frame stuff TARGET_CFLAGS+= -fno-unwind-tables -fno-asynchronous-unwind-tables +# always add debug information +TARGET_CFLAGS+= -g3 endif |