denshooter/genode
1
0
Fork 0
mirror of https://github.com/mmueller41/genode.git synced 2026-01-21 12:32:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

base-hw: problems with timeout lib in src recipe

Browse Source 
This commit fixes two issues with the timeout lib and the base-hw src recipe:

* Add source files of timeout lib to recipe content.
  The files weren't copied to the depot until now. However, the archive
  nonetheless built successfully because of the second issue that is described
  below.

* Get rid of the usage of the BASE_DIR variable in the timeout lib.
  The BASE_DIR variable always resolves to the repos/base directory even when
  building in a depot. That said, the use of BASE_DIR in make-files that are
  not part of the build system itself must be avoided. Instead, REP_DIR,
  REP_INC_DIR, and $(call select_from_repositories, ...) should be used.

Ref #4209
This commit is contained in:
Martin Stein
2022-09-20 12:23:46 +02:00
committed by Christian Helmuth
parent da150dbb1c
commit c23b74e150
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
repos/base-nova/recipes/api/base-nova/content.mk
View File

@@ -1,5 +1,8 @@
FROM_BASE_NOVA := etc include
FROM_BASE := lib/mk/timeout.mk src/lib/timeout
# base-nova.lib.a depends on timeout.lib.a, which includes base/internal/gloabls.h
FROM_BASE := lib/mk/timeout.mk src/lib/timeout \
src/include/base/internal/globals.h
content: $(FROM_BASE_NOVA) $(FROM_BASE) LICENSE