[packages/hhvm] cmake /usr/usr/ workaround

glen glen at pld-linux.org
Fri Jan 2 22:06:19 CET 2015


commit 883526f76c4c9a1b2ad6a1e8ed675c14373fbc03
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Jan 2 23:06:11 2015 +0200

    cmake /usr/usr/ workaround

 hhvm.spec | 7 +++++++
 1 file changed, 7 insertions(+)
---
diff --git a/hhvm.spec b/hhvm.spec
index 8857d45..949329d 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -341,6 +341,13 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
 if [ ! -f installed.stamp ]; then
 # begin install block
 
+# fix broken cmake rules
+# TODO: fix cmake rules
+if [ -d $RPM_BUILD_ROOT%{_prefix}/usr ]; then
+	cp -a $RPM_BUILD_ROOT%{_prefix}/usr/* $RPM_BUILD_ROOT%{_prefix}
+	rm -rf $RPM_BUILD_ROOT%{_prefix}/usr
+fi
+
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_libdir}/%{name}}
 cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/883526f76c4c9a1b2ad6a1e8ed675c14373fbc03



More information about the pld-cvs-commit mailing list