[poppler] CMakeLists.txt
Albert Astals Cid
aacid at kemper.freedesktop.org
Mon Jan 8 23:04:27 UTC 2018
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit efd2205a0bc9e838fd2184c329f8370aa292c346
Author: suzuki toshiya <mpsuzuki at hiroshima-u.ac.jp>
Date: Tue Jan 9 00:03:59 2018 +0100
add "--owner root:0 --group root:0" options to tar command in dist target
Because git-archive always uses root:root in the generated tarball,
the source tarballs (since 0.60.0) have 2 uid/gids in it.
"root:root" by git-archive, and normal users/group by normal tar.
For detail, please find the analysis at::
https://lists.freedesktop.org/archives/poppler/2017-December/012737.html
Bug #104398
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8072a93..399260c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -755,7 +755,7 @@ add_custom_target(dist
COMMAND
COMMAND git log --stat | fmt --split-only > ${CMAKE_BINARY_DIR}/ChangeLog
COMMAND git archive --prefix=${ARCHIVE_NAME}/ HEAD > ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar
- COMMAND tar -C ${CMAKE_BINARY_DIR} -rf ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar ChangeLog --transform='s,,${ARCHIVE_NAME}/,'
- COMMAND tar -C ${CMAKE_BINARY_DIR} -rf ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar glib/reference/html --transform='s,,${ARCHIVE_NAME}/,'
+ COMMAND tar -C ${CMAKE_BINARY_DIR} -rf ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar ChangeLog --transform='s,,${ARCHIVE_NAME}/,' --owner root:0 --group root:0
+ COMMAND tar -C ${CMAKE_BINARY_DIR} -rf ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar glib/reference/html --transform='s,,${ARCHIVE_NAME}/,' --owner root:0 --group root:0
COMMAND xz -9 ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
More information about the poppler
mailing list