Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
e3-require
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ESS EPICS Environment
wrappers
e3-require
Commits
3e0b11e5
Commit
3e0b11e5
authored
2 years ago
by
Lucas Magalhães
Browse files
Options
Downloads
Plain Diff
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
1 merge request
!91
E3-895: Use bash also for debug on CONFIG_SHELL
Pipeline
#117096
passed with warnings
2 years ago
Stage: check
Stage: build
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure/E3/CONFIG
+1
-1
1 addition, 1 deletion
configure/E3/CONFIG
require-ess/tools/driver.makefile
+0
-19
0 additions, 19 deletions
require-ess/tools/driver.makefile
with
1 addition
and
20 deletions
configure/E3/CONFIG
+
1
−
1
View file @
3e0b11e5
# -*- mode: Makefile;-*-
# 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)
...
...
This diff is collapsed.
Click to expand it.
require-ess/tools/driver.makefile
+
0
−
19
View file @
3e0b11e5
...
...
@@ -507,25 +507,6 @@ LOADABLE_LIBRARY=$(if ${LIBRARY_OBJS},${PRJ},)
# See ${REGISTRYFILE} rule below.
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.
HDEPENDS
=
HDEPENDS_METHOD
=
COMP
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment