Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
86e80f94
Commit
86e80f94
authored
Mar 16, 2019
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: don't do fake rpm Provides
instead remove internal modules from Requires/Provides
parent
39cea72e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
30 deletions
+6
-30
cmake/cpack_rpm.cmake
cmake/cpack_rpm.cmake
+6
-30
No files found.
cmake/cpack_rpm.cmake
View file @
86e80f94
...
@@ -67,6 +67,12 @@ SET(CPACK_RPM_SPEC_MORE_DEFINE "
...
@@ -67,6 +67,12 @@ SET(CPACK_RPM_SPEC_MORE_DEFINE "
%define _bindir
${
INSTALL_BINDIRABS
}
%define _bindir
${
INSTALL_BINDIRABS
}
%define _sbindir
${
INSTALL_SBINDIRABS
}
%define _sbindir
${
INSTALL_SBINDIRABS
}
%define _sysconfdir
${
INSTALL_SYSCONFDIR
}
%define _sysconfdir
${
INSTALL_SYSCONFDIR
}
%{?filter_setup:
%filter_from_provides /perl(
\\\\
(mtr
\\\\
|My::
\\\\
)/d
%filter_from_requires /
\\\\
(lib
\\\\
(ft
\\\\
|lzma
\\\\
|tokuportability
\\\\
)
\\\\
)
\\\\
|
\\\\
(perl(
\\\\
(.*mtr
\\\\
|My::
\\\\
|.*HandlerSocket
\\\\
|Mysql
\\\\
)
\\\\
)/d
%filter_setup
}
"
)
"
)
# this creative hack is described here: http://www.cmake.org/pipermail/cmake/2012-January/048416.html
# this creative hack is described here: http://www.cmake.org/pipermail/cmake/2012-January/048416.html
...
@@ -225,36 +231,6 @@ ELSEIF(RPM MATCHES "fedora" OR RPM MATCHES "(rhel|centos)7")
...
@@ -225,36 +231,6 @@ ELSEIF(RPM MATCHES "fedora" OR RPM MATCHES "(rhel|centos)7")
SET
(
CPACK_RPM_common_PACKAGE_CONFLICTS
"mariadb-libs < 1:%{version}-%{release}"
)
SET
(
CPACK_RPM_common_PACKAGE_CONFLICTS
"mariadb-libs < 1:%{version}-%{release}"
)
ENDIF
()
ENDIF
()
# workaround for lots of perl dependencies added by rpmbuild
SETA
(
CPACK_RPM_test_PACKAGE_PROVIDES
"perl(lib::mtr_gcov.pl)"
"perl(lib::mtr_gprof.pl)"
"perl(lib::mtr_io.pl)"
"perl(lib::mtr_misc.pl)"
"perl(lib::mtr_process.pl)"
"perl(lib::v1/mtr_cases.pl)"
"perl(lib::v1/mtr_gcov.pl)"
"perl(lib::v1/mtr_gprof.pl)"
"perl(lib::v1/mtr_im.pl)"
"perl(lib::v1/mtr_io.pl)"
"perl(lib::v1/mtr_match.pl)"
"perl(lib::v1/mtr_misc.pl)"
"perl(lib::v1/mtr_process.pl)"
"perl(lib::v1/mtr_report.pl)"
"perl(lib::v1/mtr_stress.pl)"
"perl(lib::v1/mtr_timer.pl)"
"perl(lib::v1/mtr_unique.pl)"
"perl(mtr_cases)"
"perl(mtr_io.pl)"
"perl(mtr_match)"
"perl(mtr_misc.pl)"
"perl(mtr_gcov.pl)"
"perl(mtr_gprof.pl)"
"perl(mtr_process.pl)"
"perl(mtr_report)"
"perl(mtr_results)"
"perl(mtr_unique)"
)
# If we want to build build MariaDB-shared-compat,
# If we want to build build MariaDB-shared-compat,
# extract compat libraries from MariaDB-shared-5.3 rpm
# extract compat libraries from MariaDB-shared-5.3 rpm
FILE
(
GLOB compat_rpm RELATIVE
${
CMAKE_SOURCE_DIR
}
FILE
(
GLOB compat_rpm RELATIVE
${
CMAKE_SOURCE_DIR
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment