Appy ggc-min-expand+disable-WITH_DOCS.diff (Closes: #780582), Thanks Dejan Latinovic

diff --git a/debian/control b/debian/control
index dc6aa655fce87ac914ed7d8d9e6d6a13ce39223c..4b94c660f73bb779fb2ac4bc00f24ea4aafef43a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,6 @@ Section: libs
 Priority: extra
 Build-Depends: debhelper (>= 9), dh-exec (>=0.3),
                cmake,
-               doxygen,
-               doxygen-latex,
               python-sphinx,
               libboost-system-dev,
               libboost-filesystem-dev,
@@ -26,6 +24,8 @@ Build-Depends: debhelper (>= 9), dh-exec (>=0.3),
               libxmu-dev,
               libxi-dev,
               libvtk5-qt4-dev
+Build-Depends-Indep: doxygen,
+                    doxygen-latex
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/pcl.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/pcl.git

diff --git a/debian/rules b/debian/rules
index 623282e7f43eac906077ef7dc2741cc8590a0f3c..88c850c4a44e5ae6c7311c45b86a5f145346f7a6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,13 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 CFLAGS+=$(CPPFLAGS)
 CXXFLAGS+=$(CPPFLAGS)
 
+DEB_BUILD_ARCH     ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+ifneq (,$(filter $(DEB_BUILD_ARCH),mips mipsel))
+       CXXFLAGS+=--param ggc-min-expand=20
+endif
+
+BUILD_DOC = $(if $(shell dh_listpackages | grep libpcl-doc),-DWITH_DOCS=ON)
+
 # Multiarch.
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
@@ -32,7 +39,7 @@ override_dh_auto_configure:
        -DBUILD_tools=ON -DBUILD_tracking=ON -DBUILD_visualization=ON   \
        -DBUILD_apps_cloud_composer=OFF -DBUILD_apps_modeler=ON            \
        -DBUILD_apps_point_cloud_editor=ON -DBUILD_apps_in_hand_scanner=ON \
-       -DWITH_DOCS=ON 
+       $(BUILD_DOC)
 
 override_dh_install:
        mkdir -p debian/tmp/usr/share/doc/libpcl1.7-dbg && cp debian/README.Debug debian/tmp/usr/share/doc/libpcl1.7-dbg/