The following commit has been merged in the debian-experimental-3.6 branch:
commit 2e6b22b9e93921d7ad6431c365d2d2b9f853edd1
Author: Rene Engelhard <[email protected]>
Date: Fri Jun 29 23:39:10 2012 +0200
move back to sourceable config_host.mk.source to get OUTPATH/PROEXT; rework
pyuno-py3 build to use it, too
diff --git a/rules b/rules
index b63f735..d5d2053 100755
--- a/rules
+++ b/rules
@@ -1594,8 +1594,10 @@ ifeq "$(BUILD_PYUNO)" "y"
# then...
rm -rf $(SOURCE_TREE)/pyuno-py3
cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/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"
+ . $(SOURCE_TREE)/config_host.mk.source; \
+ cd pyuno-py3 && \
+ rm -rf $$OUTPATH$$PROEXT; \
+ 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
@@ -2166,7 +2168,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="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 \
+ install -m644 $(SOURCE_TREE)/pyuno-py3/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/lib/$$i \
debian/python3-uno/$(OODIR)/program/$$i; \
done
cp debian/python-uno/$(OODIR)/program/pythonloader.py \
@@ -2245,7 +2247,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="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 \
+ install -m755 $(SOURCE_TREE)/solver/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/gsicheck \
$(PKGDIR)-dev/$(OODIR)/program/gsicheck.bin
( \
echo '#! /bin/sh'; \
@@ -2281,7 +2283,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 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)/pck && \
+ cd $(SOURCE_TREE)/solver/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/pck && \
for i in juh jurt jut ridl unoloader; do \
cp $${i}_src.zip \
$(CURDIR)/$(PKGDIR)-dev/usr/share/java; \
@@ -2334,9 +2336,9 @@ endif
#ifeq "$(PACKAGE_SDK)" "y"
# # install gengal stuff into -dev
# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-# 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 \
+# install -m755 $(SOURCE_TREE)/svx/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/gengal \
# $(PKGDIR)-dev/$(OODIR)/program/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.bin \
+# install -m755 $(SOURCE_TREE)/svx/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/gengal.bin \
# $(PKGDIR)-dev/$(OODIR)/program/gengal.bin
#endif
@@ -2726,7 +2728,7 @@ endif
#ifeq "$(PACKAGE_SDK)" "y"
# # install gengal stuff into -dev
# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-# 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 \
+# install -m644 $(SOURCE_TREE)/svx/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/gengalrc \
# $(PKGDIR)-common/$(OODIR)/program/gengalrc
#endif
touch $@
@@ -2743,7 +2745,7 @@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch
debian/control $(STAMP_DIR)/
dh_installdocs -s -A
for p in $(ARCH_DEP_PACKAGES); do \
- cat readlicense_oo/$(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/UNX/README_en-US \
+ cat readlicense_oo/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo
$$OUTPATH$$PROEXT)/misc/UNX/README_en-US \
| sed -e 's/$${PRODUCTNAME}/LibreOffice/g' \
| sed -e 's/$${PRODUCTVERSION}/3.6/g' \
> debian/$$p/usr/share/doc/$$p/README; \
@@ -2911,7 +2913,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="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`
+ -v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo
$$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version
value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut
-d: -f2`
endif
endif
endif
@@ -2976,7 +2978,7 @@ ifeq "$(PACKAGE_SDK)" "y"
endif
dh_installdocs -i -A
for p in $(ARCH_DEP_PACKAGES); do \
- cat readlicense_oo/$(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/UNX/README_en-US \
+ cat readlicense_oo/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo
$$OUTPATH$$PROEXT)/misc/UNX/README_en-US \
| sed -e "s/$${PRODUCTNAME}/LibreOffice/g" \
| sed -s "s/$${PRODUCTVERSION}/3.6/g" \
> debian/$$p/usr/share/doc/$$p/README; \
--
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]
