The following commit has been merged in the debian-experimental-3.5 branch:
commit df3da0477953407da4e4cfe390d19f688dc19a48
Author: Rene Engelhard <[email protected]>
Date: Thu Nov 3 23:44:46 2011 +0000
fix pyuno build for python3 (stray space, --libs instead of cflags). move
after sysui build and remove pyuno-py3 in clean
diff --git a/rules b/rules
index 34dcb1c..376bd2a 100755
--- a/rules
+++ b/rules
@@ -1234,6 +1234,7 @@ clean:
rm -f $(OOO_BUILD_TREE)/config.*
if [ -f Makefile ]; then $(MAKE) distclean; fi
+ rm -rf $(SOURCE_TREE)/pyuno-py3
rm -f config.status
ifneq "$(OOO_L10N_DIR)" ""
@@ -1591,19 +1592,6 @@ endif
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d`
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build
-ifeq "$(BUILD_PYUNO)" "y"
- ifeq "$(ENABLE_PYTHON3)" "y"
- # 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!
- endif
-endif
-
# apparently setting this here globally doesn't work, so hack around.
# If we don't do this we get loads of harmless, but log-bloating
# warnings
@@ -1618,6 +1606,20 @@ endif
PATH=$(BUILD_PATH) DPKG="dpkg" PKGFORMAT="deb"
NO_PKG_MANGLE=go-away \
../solenv/bin/build.pl && ../solenv/bin/deliver.pl
+ifeq "$(BUILD_PYUNO)" "y"
+ ifeq "$(ENABLE_PYTHON3)" "y"
+ # FIXME: won't work when pyuno is migrated to gbuild as all is directly
in solver
+ # then...
+ rm -rf $(SOURCE_TREE)/pyuno-py3
+ 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 --libs python-$(PY3MAJOR).$(PY3MINOR)mu) \
+ ../solenv/bin/build.pl # NO DELIVER!
+ endif
+endif
+
ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
$(CURDIR)/debian/rules check
endif
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
