The following commit has been merged in the debian-experimental-3.6 branch:
commit 7a208db556b2ecf90b9ef527c5a66fa0732015d3
Author: Rene Engelhard <[email protected]>
Date: Thu May 3 23:41:13 2012 +0200
fix pyuno-py3 build and updtae OUTPATH/PROEXT fetching to actually work
diff --git a/rules b/rules
index 66c0f22..1111064 100755
--- a/rules
+++ b/rules
@@ -1612,7 +1612,8 @@ ifeq "$(BUILD_PYUNO)" "y"
# then...
rm -rf $(SOURCE_TREE)/pyuno-py3
cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/pyuno-py3
- $(MAKE) pyuno-py3
+ rm -rf pyuno-py3/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut
-d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut
-d= -f2" | grep -v custom)
+ $(MAKE) cmd cmd="cd pyuno-py3; 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"
endif
endif
@@ -2183,7 +2184,7 @@ ifeq "$(BUILD_PYUNO)" "y"
| sed -e "s/$(PYMAJOR).$(PYMINOR)/$(PY3MAJOR).$(PY3MINOR)/" \
> debian/python3-uno/$(OODIR)/program/pythonloader.unorc
for i in pyuno.so pythonloader.uno.so libpyuno.so; do \
- install -m644 $(SOURCE_TREE)/pyuno-py3/$(shell $(MAKE) -s cmd
cmd="echo $$OUTPATH$$PROEXT" | grep -v "^custom cmd")/lib/$$i \
+ install -m644 $(SOURCE_TREE)/pyuno-py3/$(shell make -s cmd
cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd
cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)/lib/$$i \
debian/python3-uno/$(OODIR)/program/$$i; \
done
cp debian/python-uno/$(OODIR)/program/pythonloader.py \
@@ -2262,7 +2263,7 @@ ifeq "$(PACKAGE_SDK)" "y"
# install gsicheck into -dev
mkdir -p $(PKGDIR)-dev/$(OODIR)/program
- install -m755 $(SOURCE_TREE)/solver/$(shell $(MAKE) -s cmd cmd="echo
$$OUTPATH$$PROEXT" | grep -v "^custom cmd")/bin/gsicheck \
+ install -m755 $(SOURCE_TREE)/solver/$(shell make -s cmd cmd="env | grep
OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep
PROEXT\= | cut -d= -f2" | grep -v custom)/bin/gsicheck \
$(PKGDIR)-dev/$(OODIR)/program/gsicheck.bin
( \
echo '#! /bin/sh'; \
@@ -2298,7 +2299,7 @@ ifeq "$(PACKAGE_SDK)" "y"
ifeq "$(ENABLE_JAVA)" "y"
# install the UNO Java sources for e.g. eclipse
mkdir -p $(CURDIR)/$(PKGDIR)-dev/usr/share/java
- cd $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh; echo
$$OUTPATH$$PROEXT)/bin && \
+ cd $(SOURCE_TREE)/solver/$(shell make -s cmd cmd="env | grep OUTPATH\=
| cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= |
cut -d= -f2" | grep -v custom)/bin && \
for i in juh jurt jut ridl unoloader; do \
cp $${i}_src.zip \
$(CURDIR)/$(PKGDIR)-dev/usr/share/java; \
@@ -2352,9 +2353,9 @@ endif
#ifeq "$(PACKAGE_SDK)" "y"
# # install gengal stuff into -dev
# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-# install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh;
echo $$OUTPATH$$PROEXT)/bin/gengal \
+# install -m755 $(SOURCE_TREE)/svx/$(shell make -s cmd cmd="env | grep
OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep
PROEXT\= | cut -d= -f2" | grep -v custom)/bin/gengal \
# $(PKGDIR)-dev/$(OODIR)/program/gengal
-# install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh;
echo $$OUTPATH$$PROEXT)/bin/gengal.bin \
+# install -m755 $(SOURCE_TREE)/svx/$(shell make -s cmd cmd="env | grep
OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep
PROEXT\= | cut -d= -f2" | grep -v custom)/bin/gengal.bin \
# $(PKGDIR)-dev/$(OODIR)/program/gengal.bin
#endif
@@ -2739,7 +2740,7 @@ endif
#ifeq "$(PACKAGE_SDK)" "y"
# # install gengal stuff into -dev
# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-# install -m644 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh;
echo $$OUTPATH$$PROEXT)/bin/gengalrc \
+# install -m644 $(SOURCE_TREE)/svx/$(shell make -s cmd cmd="env | grep
OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep
PROEXT\= | cut -d= -f2" | grep -v custom)/bin/gengalrc \
# $(PKGDIR)-common/$(OODIR)/program/gengalrc
#endif
touch $@
@@ -2915,7 +2916,7 @@ endif
ifeq "$(PACKAGE_BASE)" "y"
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
dh_gencontrol -plibreoffice$(VER)-mysql-connector -- \
- -v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell $(MAKE)
-s cmd cmd="echo $$OUTPATH$$PROEXT" | grep -v "^custom
cmd")/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,;
s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
+ -v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell make -s
cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s
cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v
custom)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,;
s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
endif
endif
@@ -3032,7 +3033,7 @@ ifeq "$(ENABLE_REPORTDESIGN)" "y"
-V'base-version=$(BASE_VERSION)' \
-V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
- -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep
"<version" $(SOURCE_TREE)/reportbuilder/$(shell $(MAKE) -s cmd cmd="echo
$$OUTPATH$$PROEXT" | grep -v "^custom cmd")/misc/description.xml | perl -pi -e
's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut
-d: -f2`
+ -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep
"<version" $(SOURCE_TREE)/reportbuilder/$(shell make -s cmd cmd="env | grep
OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep
PROEXT\= | cut -d= -f2" | grep -v custom)/misc/description.xml | perl -pi -e
's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut
-d: -f2`
endif
dh_gencontrol -popenoffice.org-dtd-officedocument1.0 -- \
-v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 |
bc):1.0+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
--
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]
