diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-07 10:34:33 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-07 10:34:33 +0200 |
| commit | 77e8a311e1f919f15845c75d08de4340965c0bc4 (patch) | |
| tree | 7afc1e49694bb16fcdc07495a294a8d89b62f5eb /support-files | |
| parent | 3ad37ed0eb343cd173b103974aded5783958a88e (diff) | |
| parent | c24ec3cece6d8bf70dac7519b6fd397c464f7a82 (diff) | |
| download | mariadb-git-77e8a311e1f919f15845c75d08de4340965c0bc4.tar.gz | |
Merge 10.4 into 10.5
A conflict between MDEV-19514 (b42294bc6409794bdbd2051b32fa079d81cea61d)
and MDEV-20934 (d7a2401750bb29dfdb45929a536539b9f17b347f)
was resolved. We will not invoke the function ibuf_delete_recs()
from ibuf_merge_or_delete_for_page(). Instead, we will add that
logic to the function ibuf_read_merge_pages().
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index c3ff1383f86..863e72928d2 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -68,11 +68,12 @@ IF(UNIX) IF(CHECKMODULE AND SEMODULE_PACKAGE) FOREACH(pol mariadb) SET(src ${CMAKE_CURRENT_SOURCE_DIR}/policy/selinux/${pol}.te) - SET(tmp ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${pol}-pp.dir/${pol}.mod) + SET(tmp ${CMAKE_CURRENT_BINARY_DIR}/${pol}.mod) SET(out ${CMAKE_CURRENT_BINARY_DIR}/${pol}.pp) ADD_CUSTOM_COMMAND(OUTPUT ${out} COMMAND ${CHECKMODULE} -M -m ${src} -o ${tmp} COMMAND ${SEMODULE_PACKAGE} -m ${tmp} -o ${out} + COMMAND ${CMAKE_COMMAND} -E remove ${tmp} DEPENDS ${src}) ADD_CUSTOM_TARGET(${pol}-pp ALL DEPENDS ${out}) INSTALL(FILES ${out} DESTINATION ${inst_location}/policy/selinux COMPONENT SupportFiles) |