commit 66afd21285d86172db09f1124acec343908a75d9
Author: Jan Palus <at...@pld-linux.org>
Date: Tue Sep 13 20:17:00 2016 +0200
another attempt at fixing multi python build
VBOX_WITH_MULTIVERSION_PYTHON is always defined so make VBOX_MULTIPYTHON
depend on VBOX_WITH_MULTIVERSION_PYTHON
VirtualBox-multipython.patch | 11 +++++++++++
VirtualBox.spec | 2 ++
2 files changed, 13 insertions(+)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 44df3f6..b3b2597 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -79,6 +79,7 @@ Patch11: 18-system-xorg.patch
Patch12: %{pname}-all-translations.patch
Patch13: x32.patch
Patch14: %{pname}-no-scrextend.patch
+Patch15: %{pname}-multipython.patch
URL: http://www.virtualbox.org/
%if %{with userspace}
%ifarch %{x8664}
@@ -531,6 +532,7 @@ cd ../..\
%endif
%patch13 -p1
%patch14 -p1
+%patch15 -p0
%{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
-e 's/Categories=.*/Categories=Utility;Emulator;/'
src/VBox/Installer/common/virtualbox.desktop.in
diff --git a/VirtualBox-multipython.patch b/VirtualBox-multipython.patch
new file mode 100644
index 0000000..61df17d
--- /dev/null
+++ b/VirtualBox-multipython.patch
@@ -0,0 +1,11 @@
+--- ./src/libs/xpcom18a4/python/Makefile.kmk.orig 2016-09-13
20:04:08.869585445 +0200
++++ ./src/libs/xpcom18a4/python/Makefile.kmk 2016-09-13 20:04:29.852832898
+0200
+@@ -19,7 +19,7 @@
+ include $(KBUILD_PATH)/subheader.kmk
+
+ ifdef VBOX_WITH_MULTIVERSION_PYTHON
+- VBOX_MULTIPYTHON = 1
++ VBOX_MULTIPYTHON = $(VBOX_WITH_MULTIVERSION_PYTHON)
+ else
+ VBOX_MULTIPYTHON = 0
+ endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/66afd21285d86172db09f1124acec343908a75d9
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
