[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-4-65-g852bf9e
The following commit has been merged in the debian-experimental-3.5 branch:
commit 9ba01e3e2acf9ca3c6d754682cda39d05dbb90b9
Author: Rene Engelhard <rene@debian.org>
Date: Thu Nov 3 20:37:26 2011 +0000
correctly separate pyuno build for python3
diff --git a/rules b/rules
index ce38617..98521f0 100755
--- a/rules
+++ b/rules
@@ -1592,7 +1592,11 @@ endif
ifeq "$(BUILD_PYUNO)" "y"
ifeq "$(ENABLE_PYTHON3)" "y"
- cd $(SOURCE_TREE)/pyuno; \
+ # FIXME: won't work when pyuno is migrated to gbuild as all is directly in solver
+ # then...
+ cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/pyuno-py3
+ cd $(SOURCE_TREE)/pyuno-py3; \
+ rm -rf $(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT); \
. $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
PATH=$(BUILD_PATH) PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell pkg-config --cflags python-$(PY3MAJOR).$(PY3MINOR)mu) PYTHON_LIBS=$(shell pkg-config --cflags python-$(PY3MAJOR).$(PY3MINOR)mu) \
../solenv/bin/build.pl # NO DELIVER!
--
LibreOffice packaging repository
Reply to: