[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-4-14-g7d2a1d4
The following commit has been merged in the master branch:
commit b74a7c0953bdca4f322437554565b49a891dd49f
Author: Rene Engelhard <rene@debian.org>
Date: Mon Apr 23 21:43:00 2012 +0200
only ship (and build) unowinreg.dll for i386/amd64
diff --git a/changelog b/changelog
index 87305c3..88e48b0 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,8 @@ libreoffice (1:3.5.2-5) UNRELEASED; urgency=low
* debian/rules:
- build-depend on new g++-mingw-w64-i686 instead of the whole thing
- use gcc 4.4 on mipsel
+ - only ship (and build) unowinreg.dll for i386/amd64. Probably not used
+ on other archs and it saves us the g++-mingw-w64-i686 build-dep there
* debian/libreoffice-common.links: move ...
* debian/libreoffice-common.links.in: ... here again as we need to
subsitute @OODIR@ (closes: #669138)
diff --git a/rules b/rules
index 978fdc1..a669b53 100755
--- a/rules
+++ b/rules
@@ -291,6 +291,10 @@ SYSTEM_STUFF += libpng
SYSTEM_STUFF += nss
SYSTEM_STUFF += mozilla-headers
SYSTEM_STUFF += sampleicc
+PACKAGE_UNOWINREG_DLL=y
+ifeq "$(DEB_VENDOR)" "Debian"
+BUILD_UNOWINREG_DLL=y
+endif
# Default flags to pass to configure
CONFIGURE_FLAGS= \
@@ -369,6 +373,11 @@ OOO_GCJ_JDK_ARCHS := hppa kfreebsd-i386 kfreebsd-amd64
OOO_OPENJDK_ARCHS := $(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_OPENJDK_ARCHS))
+OOO_UNOWINREG_DLL_ARCHS := i386 amd64
+ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_UNOWINREG_DLL_ARCHS)))
+ PACKAGE_UNOWINREG_DLL=n
+endif
+
OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(filter-out s390 s390x,$(OOO_ARCHS))
OOO_EXTENSIONS_ARCHS := $(OOO_ARCH_DEP_EXTENSIONS_ARCHS)
@@ -790,14 +799,16 @@ export JAVA_HOME
BUILD_DEPS += , libsaxonb-java$(OOO_NO_JAVA_ARCHS)
endif
ifeq "$(PACKAGE_SDK)" "y"
- ifeq "$(DEB_VENDOR)" "Debian"
+ ifeq "$(PACKAGE_UNOWINREG_DLL)" "y"
+ ifeq "$(BUILD_UNOWINREG_DLL)" "y"
CONFIGURE_FLAGS += --enable-build-unowinreg
- ifeq "$(SQUEEZE_BACKPORT)" "y"
- BUILD_DEPS += , gcc-mingw32$(OOO_NO_JAVA_ARCHS), mingw32-runtime$(OOO_NO_JAVA_ARCHS)
+ ifeq "$(SQUEEZE_BACKPORT)" "y"
+ BUILD_DEPS += , gcc-mingw32 [$(OOO_UNOWINREG_DLL_ARCHS)], mingw32-runtime[$(OOO_UNOWINREG_DLL_ARCHS)]
CONFIGURE_FLAGS += --with-mingw-cross-compiler=i586-mingw32msvc-g++
- else
- BUILD_DEPS += , g++-mingw-w64-i686 $(OOO_NO_JAVA_ARCHS)
+ else
+ BUILD_DEPS += , g++-mingw-w64-i686 [$(OOO_UNOWINREG_DLL_ARCHS)]
CONFIGURE_FLAGS += --with-mingw-cross-compiler=i686-w64-mingw32-g++
+ endif
endif
endif
endif
@@ -1559,6 +1570,14 @@ endif
# Make sure we have /proc mounted - otherwise idlc will fail later.
test -r /proc/version
+ifneq "$(PACKAGE_UNOWINREG_DLL)" "y"
+ ifneq "$(BUILD_UNOWINREG_DLL)" "y"
+ # create fake file if file not there; we don't use it anyways.
+ if [ ! -f $(TARFILE_LOCATION)/185d60944ea767075d27247c3162b3bc-unowinreg.dll ]; then \
+ touch $(TARFILE_LOCATION)/185d60944ea767075d27247c3162b3bc-unowinreg.dll; \
+ fi
+ endif
+endif
# FIXME: Theoretically this should call ./configure instead of
# it exists but that causes the configure flags NOT to be hnoured
# somehow...
@@ -2192,15 +2211,19 @@ ifeq "$(PACKAGE_SDK)" "y"
ifeq "$(ENABLE_JAVA)" "y"
# compat/safety symlink for SDK Java stuff moved to /usr/share
rm -f $(PKGDIR)-dev/$(OOSDKDIR)/classes
- mkdir -p $(PKGDIR)-dev/$(OOSDKDIR)/classes/win
mkdir -p $(PKGDIR)-dev/$(OOSDKDIR)/classes/com/sun/star/lib/loader
- chmod 644 $(PKGDIR)-dev/$(shell echo $(OOSDKDIR) | sed -e s/lib/share/)/classes/win/unowinreg.dll
cd $(PKGDIR)-dev/$(OOSDKDIR)/classes/com/sun/star/lib/loader && \
for i in $(CURDIR)/$(PKGDIR)-dev/$(shell echo $(OOSDKDIR) | sed -e s/lib/share/)/classes/com/sun/star/lib/loader/*.class; do \
ln -s `echo $$i | sed -e 's,$(CURDIR)/$(PKGDIR)-dev,,'` `basename $$i`; \
done
+ ifeq "$(PACKAGE_UNOWINREG_DLL)" "y"
+ mkdir -p $(PKGDIR)-dev/$(OOSDKDIR)/classes/win
+ chmod 644 $(PKGDIR)-dev/$(shell echo $(OOSDKDIR) | sed -e s/lib/share/)/classes/win/unowinreg.dll
ln -s /$(shell echo $(OOSDKDIR) | sed -e s/lib/share/)/classes/win/unowinreg.dll \
$(PKGDIR)-dev/$(OOSDKDIR)/classes/win/unowinreg.dll
+ else
+ rm -rf $(PKGDIR)-dev/$(shell echo $(OOSDKDIR) | sed -e s/lib/share/)/classes/win
+ endif
endif
chmod 644 $(PKGDIR)-dev/$(OOSDKDIR)/configure.pl
for i in csh csh.in; do \
--
LibreOffice packaging repository
Reply to: