summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2015-10-11 10:32:44 +0200
committerSergey Vojtovich <svoj@mariadb.org>2015-10-12 11:29:31 +0200
commit01a9f46d20639994636b7815a7cac23efa393391 (patch)
treeedf7339ce5fd8a179f35f90834cb2dff01c9e83e
parent9f2ec8e4743f20aa08787f5e209eb8cf9c5a3d08 (diff)
downloadmariadb-git-bb-systemd.tar.gz
Fixed Fedora 22 package build failure.bb-systemd
Since MariaDB packages have absolute paths, they are marked as not relocatable by setting CPACK_RPM_PACKAGE_RELOCATABLE. According to logics of recent CPackRPM it is not enough: one needs to set CPACK_PACKAGE_RELOCATABLE additionally.
-rw-r--r--cmake/cpack_rpm.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
index 1b5183345f6..d1030be0660 100644
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -34,6 +34,7 @@ SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE
SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}")
SET(CPACK_RPM_PACKAGE_LICENSE "GPL")
SET(CPACK_RPM_PACKAGE_RELOCATABLE FALSE)
+SET(CPACK_PACKAGE_RELOCATABLE FALSE)
SET(CPACK_RPM_PACKAGE_GROUP "Applications/Databases")
SET(CPACK_RPM_PACKAGE_SUMMARY ${CPACK_PACKAGE_SUMMARY})
SET(CPACK_RPM_PACKAGE_URL ${CPACK_PACKAGE_URL})