Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
2494796f
Commit
2494796f
authored
Nov 27, 2018
by
Ronan
Committed by
Ronan
Nov 27, 2018
Browse files
chore(build): do not set CMAKE_INSTALL_LIBDIR and never with _libdir!
parent
4d836c4c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
build/rpm/liblinphone.spec.cmake
build/rpm/liblinphone.spec.cmake
+7
-2
No files found.
build/rpm/liblinphone.spec.cmake
View file @
2494796f
...
@@ -64,7 +64,7 @@ develop programs using the liblinphone library.
...
@@ -64,7 +64,7 @@ develop programs using the liblinphone library.
%setup -n %{name}-%{version}%{?build_number_ext}
%setup -n %{name}-%{version}%{?build_number_ext}
%build
%build
%{expand:%%%cmake_name} . -DCMAKE_BUILD_TYPE=@CMAKE_BUILD_TYPE@
-DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir}
-DCMAKE_PREFIX_PATH:PATH=%{_prefix} @RPM_ALL_CMAKE_OPTIONS@
%{expand:%%%cmake_name} . -DCMAKE_BUILD_TYPE=@CMAKE_BUILD_TYPE@ -DCMAKE_PREFIX_PATH:PATH=%{_prefix} @RPM_ALL_CMAKE_OPTIONS@
make %{?_smp_mflags}
make %{?_smp_mflags}
%install
%install
...
@@ -86,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
...
@@ -86,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
%postun -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%files
%
defattr
(
-,root,root
)
%
defattr
(
-,root,root
)
%doc ChangeLog.md COPYING README.md
%doc ChangeLog.md COPYING README.md
%if @ENABLE_DAEMON@ || @ENABLE_CONSOLE_UI@ || @ENABLE_TOOLS@
%if @ENABLE_DAEMON@ || @ENABLE_CONSOLE_UI@ || @ENABLE_TOOLS@
...
@@ -121,7 +121,12 @@ rm -rf $RPM_BUILD_ROOT
...
@@ -121,7 +121,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
%changelog
* Tue Nov 27 2018 ronan.abhamon <ronan.abhamon@belledonne-communications.com>
- Do not set CMAKE_INSTALL_LIBDIR and never with _libdir!
* Thu Jul 13 2017 jehan.monnier <jehan.monnier@linphone.org>
* Thu Jul 13 2017 jehan.monnier <jehan.monnier@linphone.org>
- cmake port
- cmake port
* Mon Aug 19 2013 jehan.monnier <jehan.monnier@linphone.org>
* Mon Aug 19 2013 jehan.monnier <jehan.monnier@linphone.org>
- Initial RPM release.
- Initial RPM release.
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