Skip to content
Snippets Groups Projects
Commit 3e0b11e5 authored by Lucas Magalhães's avatar Lucas Magalhães
Browse files

Merge branch 'E3-895' into 'master'

E3-895: Use bash also for debug on CONFIG_SHELL

See merge request e3/e3-require!91
parents a0475722 abd6eff0
No related branches found
No related tags found
No related merge requests found
# -*- mode: Makefile;-*- # -*- mode: Makefile;-*-
# Update the module version (for numeric versions) with a build number of 0 if none is specified # Update the module version (for numeric versions) with a build number of 0 if none is specified
E3_MODULE_VERSION:=$(E3_MODULE_VERSION)$(shell [[ "$(E3_MODULE_VERSION)" =~ ^[0-9]+\.[0-9]+\.[0-9]+$$ ]] && echo +0) E3_MODULE_VERSION:=$(E3_MODULE_VERSION)$(shell (echo "$(E3_MODULE_VERSION)" | grep -Eq "^[0-9]+\.[0-9]+\.[0-9]+\$$") && echo +0)
E3_MODULES_PATH?=$(E3_SITEMODS_PATH) E3_MODULES_PATH?=$(E3_SITEMODS_PATH)
......
...@@ -507,25 +507,6 @@ LOADABLE_LIBRARY=$(if ${LIBRARY_OBJS},${PRJ},) ...@@ -507,25 +507,6 @@ LOADABLE_LIBRARY=$(if ${LIBRARY_OBJS},${PRJ},)
# See ${REGISTRYFILE} rule below. # See ${REGISTRYFILE} rule below.
LIBOBJS += $(if $(MODULEDBD), $(addsuffix $(OBJ),$(basename ${REGISTRYFILE}))) LIBOBJS += $(if $(MODULEDBD), $(addsuffix $(OBJ),$(basename ${REGISTRYFILE})))
# For backward compatibility:
# Provide a global symbol for every version with the same
# major and equal or smaller minor version number.
# Other code using this will look for one of those symbols.
# Add an undefined symbol for the version of every used driver.
# This is done with the #define in the used headers (see below).
MAJOR_MINOR_PATCH=$(subst ., ,${LIBVERSION})
MAJOR=$(word 1,${MAJOR_MINOR_PATCH})
MINOR=$(word 2,${MAJOR_MINOR_PATCH})
PATCH=$(word 3,${MAJOR_MINOR_PATCH})
ifneq (${MINOR},)
ALLMINORS := $(shell for ((i=0;i<=${MINOR};i++));do echo $$i;done)
ifeq (${OS_CLASS}, Linux)
PROVIDES = ${ALLMINORS:%=-Wl,--defsym,${PRJ}Lib_${MAJOR}.%=0}
endif # Linux
endif # MINOR
LDFLAGS += ${PROVIDES} ${USR_LDFLAGS_${T_A}}
# Create and include dependency files. # Create and include dependency files.
HDEPENDS = HDEPENDS =
HDEPENDS_METHOD = COMP HDEPENDS_METHOD = COMP
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment