Skip to content
Snippets Groups Projects
Commit 9184d78f authored by Simon Rose's avatar Simon Rose
Browse files

Merge branch 'fix_append_buffering_issue' into 'master'

Small fix for weird buffering issue

See merge request e3/e3-require!80
parents 9b692d59 80a7b9af
No related branches found
No related tags found
1 merge request!80Small fix for weird buffering issue
Pipeline #107683 passed
......@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Fixed issue where `.hpp` files were not installed correctly with `KEEP_HEADER_SUBDIRS`
* Missing `REQUIRED` dependencies now cause the build to fail instead of providing a warning
* Fixed issue where consecutive builds might not track updated dependencies
* Fixed an issue related to buffering of data being written to a shared filesystem which produced garbled `.dep` files
### Other changes
* Rename `iocsh.bash` to `iocsh`
......
......@@ -868,7 +868,7 @@ ${DEPFILE}: ${LIBOBJS} $(USERMAKEFILE)
$(RM) $@.tmp
@echo "# Generated file. Do not edit." > $@
# Check dependencies on other module headers.
cat *.d 2>/dev/null | sed 's/ /\n/g' | grep -v '$(EPICS_BASE)/include' | sed -n '$(DEP_PARSER)' >> $@.tmp
cat *.d 2>/dev/null | sed 's/ /\n/g' | grep -v '$(EPICS_BASE)/include' | sed -n '$(DEP_PARSER)' > $@.tmp
# Manully added dependencies: ${REQ}
@$(foreach m,${REQ},echo "$m $(or $(and $(or $(wildcard $(EPICS_MODULES)/$m/$($m_VERSION)),$(wildcard $(E3_SITEMODS_PATH)/$m/$($m_VERSION))),$($m_VERSION)),$(error REQUIRED module '$m' version '$($m_VERSION)' does not exist))" >> $@.tmp;)
cat $@.tmp | sort -u >> $@
......
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