Hi Rene, please consider to apply the attached patches against the 4.4 alpha1 tag, which clean up ./debian/rules in LibreOffice and also safe some ~100 LOC there. Tested on Deebian unstable to produce the same output for ./debian/control as before.
Best, Bjoern
>From 88fa0602609559434c359a9fc8350dfebc5715e6 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen <[email protected]> Date: Wed, 22 Oct 2014 23:56:37 +0200 Subject: [PATCH 1/3] simplify build-dep generation this should be the base for further cleanup --- rules | 233 +++++++++++++++++++----------------------------------------------- 1 file changed, 66 insertions(+), 167 deletions(-) diff --git a/rules b/rules index 8803155..baec2a5 100755 --- a/rules +++ b/rules @@ -479,6 +479,12 @@ define gen_no_archs $$(_no_arch_macro) = $$(if $$(_no_arch_tmp_$1),$$(_empty) [$$(_no_arch_tmp_$1)]) endef +# helper for system build deps +COMMA:=, +define add_system_dep +$(if $(filter $(1),$(SYSTEM_STUFF)),$(COMMA) $(2)) +endef + PLATFORMID := $(shell grep PLATFORMID debian/vars.$(DEB_HOST_ARCH) | cut -d"=" -f2) ifeq "$(ENABLE_OPENGL)" "y" @@ -659,9 +665,8 @@ endif BUILDDEB_OPTIONS ?= -- -Zxz -ifneq (,$(findstring mesa-headers,$(SYSTEM_STUFF))) - BUILD_DEPS += , libgl1-mesa-dev, libglu1-mesa-dev -endif +BUILD_DEPS += $(call add_system_dep, mesa-headers, libgl1-mesa-dev$(COMMA) libglu1-mesa-dev) + ifneq "$(ENABLE_OPENGL)" "y" CONFIGURE_FLAGS += --disable-opengl endif @@ -692,46 +697,28 @@ endif BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev ifeq "$(ENABLE_GRAPHITE)" "y" - ifneq (,$(filter graphite, $(SYSTEM_STUFF))) - BUILD_DEPS += , libgraphite2-dev (>= 0.9.3) - endif + BUILD_DEPS += $(call add_system_dep, graphite, libgraphite2-dev (>= 0.9.3)) else CONFIGURE_FLAGS += --disable-graphite endif -ifneq (,$(filter harfbuzz, $(SYSTEM_STUFF))) - BUILD_DEPS += , libharfbuzz-dev (>= 0.9.18) -endif +BUILD_DEPS += $(call add_system_dep, harfbuzz, libharfbuzz-dev (>= 0.9.18)) +BUILD_DEPS += $(call add_system_dep, libexttextcat, libexttextcat-dev (>= 3.1.1)) ifneq (,$(filter libexttextcat, $(SYSTEM_STUFF))) - BUILD_DEPS += , libexttextcat-dev (>= 3.1.1) TEXTCAT_DATA_RECOMMENDS := libexttextcat-data endif -ifneq (,$(filter jpeg, $(SYSTEM_STUFF))) - BUILD_DEPS += , libjpeg-dev -endif +BUILD_DEPS += $(call add_system_dep, jpeg, libjpeg-dev) +BUILD_DEPS += $(call add_system_dep, libxml, libxml2-dev$(COMMA) libxml2-utils$(COMMA) libxslt1-dev) ifneq (,$(filter libxml, $(SYSTEM_STUFF))) - BUILD_DEPS += , libxml2-dev, libxml2-utils - BUILD_DEPS += , libxslt1-dev DBG_DBG_SUGGESTS+= , libxslt1-dbg endif -ifneq (,$(filter expat, $(SYSTEM_STUFF))) - BUILD_DEPS += , libexpat1-dev -endif -ifneq (,$(filter odbc, $(SYSTEM_STUFF))) - BUILD_DEPS += , unixodbc-dev (>= 2.2.11) -endif -ifneq (,$(filter sane, $(SYSTEM_STUFF))) - BUILD_DEPS += , libsane-dev -endif -ifneq (,$(filter libpng, $(SYSTEM_STUFF))) - BUILD_DEPS += , libpng12-dev -endif - -ifneq (,$(filter curl, $(SYSTEM_STUFF))) - BUILD_DEPS += , libcurl4-$(CURL_SECTYPE)-dev -endif +BUILD_DEPS += $(call add_system_dep, expat, libexpat1-dev) +BUILD_DEPS += $(call add_system_dep, odbc, unixodbc-dev (>= 2.2.11)) +BUILD_DEPS += $(call add_system_dep, sane, libsane-dev) +BUILD_DEPS += $(call add_system_dep, libpng, libpng12-dev) +BUILD_DEPS += $(call add_system_dep, curl, libcurl4-$(CURL_SECTYPE)-dev) ifneq ($(ENABLE_COINMP),y) CONFIGURE_FLAGS += --disable-coinmp @@ -739,8 +726,8 @@ else BUILD_DEPS += , coinor-libcoinmp-dev, coinor-libcoinutils-dev endif +BUILD_DEPS += $(call add_system_dep, openssl, libssl-dev (>= 0.9.8)) ifneq (,$(filter openssl, $(SYSTEM_STUFF))) - BUILD_DEPS += , libssl-dev (>= 0.9.8) DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/$(DEB_HOST_MULTIARCH)/libssl.so | cut -d"." -f3,4,5)-dbg endif ifeq "$(USE_OPENCL)" "y" @@ -809,9 +796,7 @@ endif ifeq "$(RUN_TESTTOOL)" "y" CONFIGURE_FLAGS += --enable-hids endif -ifneq (,$(filter cppunit, $(SYSTEM_STUFF))) - BUILD_DEPS += , libcppunit-dev (>= 1.12) -endif +BUILD_DEPS += $(call add_system_dep, cppunit, libcppunit-dev (>= 1.12)) ifeq "$(RUN_MAKE_CHECK)" "y" BUILD_DEPS += , gdb BUILD_DEPS += , fontconfig @@ -987,17 +972,11 @@ else DEBHELPER_OPTIONS += -Nlibreoffice-officebean -Nlibreoffice-java-common -Nlibreoffice-gcj -Nlibreoffice-script-provider-bsh -Nlibreoffice-script-provider-js endif +BUILD_DEPS += $(call add_system_dep, nss, libnss3-dev (>= 3.12.3)) ifneq (,$(filter nss, $(SYSTEM_STUFF))) - BUILD_DEPS+= , libnss3-dev (>= 3.12.3) DBG_DBG_SUGGESTS+= , libnss3-dbg endif -ifneq (,$(filter npapi-headers, $(SYSTEM_STUFF))) - ifneq "$(WHEEZY_BACKPORT)" "y" - BUILD_DEPS+= , npapi-sdk-dev - else - BUILD_DEPS+= , xulrunner-dev - endif -endif +BUILD_DEPS += $(call add_system_dep, npapi-headers, $(if $(filter y, $(WHEEZY_BACKPORT)), xulrunner-dev, npapi-sdk-dev)) ifeq "$(USE_UCPP)" "y" ifneq (,$(filter ucpp, $(SYSTEM_STUFF))) @@ -1012,18 +991,10 @@ else endif BUILD_DEPS += , $(IDLC_CPP_DEPENDS) -ifneq (,$(filter hunspell, $(SYSTEM_STUFF))) - BUILD_DEPS += , libhunspell-dev $(HUNSPELL_MIN_VER) -endif +BUILD_DEPS += $(call add_system_dep, hunspell, libhunspell-dev $(HUNSPELL_MIN_VER)) CONFIGURE_FLAGS += --with-external-dict-dir=$(DICT_DIR) -ifneq (,$(filter altlinuxhyph, $(SYSTEM_STUFF))) - ifeq "$(USE_LIBHYPHEN)" "y" - BUILD_DEPS += , libhyphen-dev $(LIBHYPHEN_MINVER) - else - BUILD_DEPS += , libaltlinuxhyph-dev $(LIBALTLINUXHYPH_MINVER) - endif -endif +BUILD_DEPS += $(call add_system_dep, altlinuxhyph, $(if $(filter y,$(USE_LIBHYPHEN)), libhyphen-dev $(LIBHYPHEN_MINVER), libaltlinuxhyph-dev $(LIBALTLINUXHYPH_MINVER))) CONFIGURE_FLAGS += --with-external-hyph-dir=$(HYPH_DIR) ifneq (,$(filter boost, $(SYSTEM_STUFF))) @@ -1053,92 +1024,44 @@ ifneq (,$(filter boost, $(SYSTEM_STUFF))) endif endif -ifneq (,$(filter mdds, $(SYSTEM_STUFF))) - BUILD_DEPS += , libmdds-dev (>= 0.10.3) -endif +BUILD_DEPS += $(call add_system_dep, mdds, libmdds-dev (>= 0.10.3)) ifeq "$(ENABLE_ORCUS)" "y" - ifneq (,$(filter orcus, $(SYSTEM_STUFF))) - BUILD_DEPS += , liborcus-dev (>= 0.7.0) - endif + BUILD_DEPS += $(call add_system_dep, orcus, liborcus-dev (>= 0.7.0)) else CONFIGURE_FLAGS += --disable-orcus endif -ifneq (,$(filter vigra, $(SYSTEM_STUFF))) - BUILD_DEPS += , libvigraimpex-dev -endif - -ifneq (,$(filter clucene, $(SYSTEM_STUFF))) - BUILD_DEPS += , libclucene-dev (>= 2.3.3.4-2) -endif +BUILD_DEPS += $(call add_system_dep, vigra, libvigraimpex-dev) +BUILD_DEPS += $(call add_system_dep, clucene, libclucene-dev (>= 2.3.3.4-2)) ifeq "$(USE_EXTERNAL_CXXLIBS)" "y" - ifneq (,$(filter librevenge, $(SYSTEM_STUFF))) - BUILD_DEPS += , librevenge-dev - endif - ifneq (,$(filter libwpd, $(SYSTEM_STUFF))) - BUILD_DEPS += , libwpd-dev (>= 0.10) - endif - ifneq (,$(filter mythes, $(SYSTEM_STUFF))) - BUILD_DEPS += , libmythes-dev (>= 2:1.2) - endif - ifneq (,$(filter libwps, $(SYSTEM_STUFF))) - BUILD_DEPS += , libwps-dev (>= 0.3) - endif - ifneq (,$(filter libwpg, $(SYSTEM_STUFF))) - BUILD_DEPS += , libwpg-dev (>= 0.3) - endif - ifneq (,$(filter libvisio, $(SYSTEM_STUFF))) - BUILD_DEPS += , libvisio-dev (>= 0.1) - endif - ifneq (,$(filter libcdr, $(SYSTEM_STUFF))) - BUILD_DEPS += , libcdr-dev (>= 0.1) - endif - ifneq (,$(filter libmspub, $(SYSTEM_STUFF))) - BUILD_DEPS += , libmspub-dev (>= 0.1) - endif - ifneq (,$(filter libmwaw, $(SYSTEM_STUFF))) - BUILD_DEPS += , libmwaw-dev (>= 0.3.3) - endif - ifneq (,$(filter libodfgen, $(SYSTEM_STUFF))) - BUILD_DEPS += , libodfgen-dev (>= 0.1) - endif - ifneq (,$(filter libetonyek, $(SYSTEM_STUFF))) - BUILD_DEPS += , libetonyek-dev (>= 0.1.1) - endif - ifneq (,$(filter libfreehand, $(SYSTEM_STUFF))) - BUILD_DEPS += , libfreehand-dev (>= 0.1) - endif - ifneq (,$(filter libabw, $(SYSTEM_STUFF))) - BUILD_DEPS += , libabw-dev (>= 0.1) - endif - ifneq (,$(filter libpagemaker, $(SYSTEM_STUFF))) - BUILD_DEPS += , libpagemaker-dev - endif - ifneq (,$(filter libebook, $(SYSTEM_STUFF))) - BUILD_DEPS += , libe-book-dev (>= 0.1.1) - endif - ifneq (,$(filter libcmis, $(SYSTEM_STUFF))) - BUILD_DEPS += , libcmis-dev (>= 0.4.0) - endif + BUILD_DEPS += $(call add_system_dep, librevenge, librevenge-dev) + BUILD_DEPS += $(call add_system_dep, libwpd, libwpd-dev (>= 0.10)) + BUILD_DEPS += $(call add_system_dep, mythes, libmythes-dev (>= 2:1.2)) + BUILD_DEPS += $(call add_system_dep, libwps, libwps-dev (>= 0.3)) + BUILD_DEPS += $(call add_system_dep, libwpg, libwpg-dev (>= 0.3)) + BUILD_DEPS += $(call add_system_dep, libvisio, libvisio-dev (>= 0.1)) + BUILD_DEPS += $(call add_system_dep, libcdr, libcdr-dev (>= 0.1)) + BUILD_DEPS += $(call add_system_dep, libmspub, libmspub-dev (>= 0.1)) + BUILD_DEPS += $(call add_system_dep, libmwaw, libmwaw-dev (>= 0.3.3)) + BUILD_DEPS += $(call add_system_dep, libodfgen, libodfgen-dev (>= 0.1)) + BUILD_DEPS += $(call add_system_dep, libetonyek, libetonyek-dev (>= 0.1.1)) + BUILD_DEPS += $(call add_system_dep, libfreehand, libfreehand-dev (>= 0.1)) + BUILD_DEPS += $(call add_system_dep, libabw, libabw-dev (>= 0.1)) + BUILD_DEPS += $(call add_system_dep, libpagemaker, libpagemaker-dev) + BUILD_DEPS += $(call add_system_dep, libebook, libe-book-dev (>= 0.1.1)) + BUILD_DEPS += $(call add_system_dep, libcmis, libcmis-dev (>= 0.4.0)) endif CONFIGURE_FLAGS += --with-external-thes-dir=$(THES_DIR) ifeq "$(ENABLE_EOT)" "y" CONFIGURE_FLAGS += --enable-eot - ifneq (,$(filter libeot, $(SYSTEM_STUFF))) - BUILD_DEPS += , libeot-dev - endif + BUILD_DEPS += $(call add_system_dep, libeot, libeot-dev) endif -ifneq (,$(filter lcms2, $(SYSTEM_STUFF))) - BUILD_DEPS += , liblcms2-dev -endif - -ifneq (,$(filter openldap, $(SYSTEM_STUFF))) - BUILD_DEPS += , libldap2-dev -endif +BUILD_DEPS += $(call add_system_dep, lcms2, liblcms2-dev) +BUILD_DEPS += $(call add_system_dep, openldap, libldap2-dev) ifeq ($(ENABLE_TELEPATHY),y) BUILD_DEPS += , libtelepathy-glib-dev (>= 0.18) @@ -1146,22 +1069,15 @@ ifeq ($(ENABLE_TELEPATHY),y) endif ifeq ($(ENABLE_LIBLANGTAG),y) - ifneq (,$(filter liblangtag, $(SYSTEM_STUFF))) - BUILD_DEPS += , liblangtag-dev (>= 0.4) - endif + BUILD_DEPS += $(call add_system_dep, liblangtag, liblangtag-dev (>= 0.4)) else CONFIGURE_FLAGS += --disable-liblangtag endif -ifneq (,$(filter icu, $(SYSTEM_STUFF))) - BUILD_DEPS += , libicu-dev $(ICU_MINVER) -endif - +BUILD_DEPS += $(call add_system_dep, icu, libicu-dev $(ICU_MINVER)) ifeq "$(BUILD_CAIROCANVAS)" "y" - ifneq (,$(filter cairo, $(SYSTEM_STUFF))) - BUILD_DEPS+= , libcairo2-dev - endif + BUILD_DEPS += $(call add_system_dep, cairo, libcairo2-dev) else CONFIGURE_FLAGS+= --disable-cairo endif @@ -1187,30 +1103,20 @@ endif ifeq "$(ENABLE_MYSQLNATIVE)" "y" CONFIGURE_FLAGS += --enable-ext-mariadb-connector ifneq "$(USE_MARIADB)" "y" - ifneq (,$(filter mysql-cppconn, $(SYSTEM_STUFF))) - BUILD_DEPS += , libmysqlclient-dev - endif - MARIADBCONFIG=/usr/bin/mysql_config + BUILD_DEPS += $(call add_system_dep, mysql-cppconn, libmysqlclient-dev) + MARIADBCONFIG=/usr/bin/mysql_config else - ifneq (,$(filter mariadb, $(SYSTEM_STUFF))) - BUILD_DEPS += , libmariadbclient-dev (>= 1.1.0~) - endif - MARIADBCONFIG=/usr/bin/mariadb_config - endif - ifneq (,$(filter mysql-cppconn, $(SYSTEM_STUFF))) - BUILD_DEPS += , libmysqlcppconn-dev $(MYSQLCPPCONN_MINVER) + BUILD_DEPS += $(call add_system_dep, mariadb, libmariadbclient-dev (>= 1.1.0~)) + MARIADBCONFIG=/usr/bin/mariadb_config endif + BUILD_DEPS += $(call add_system_dep, mysql-cppconn, libmysqlcppconn-dev $(MYSQLCPPCONN_MINVER)) endif ifeq "$(ENABLE_FIREBIRD)" "y" - ifneq (,$(filter libatomic-ops, $(SYSTEM_STUFF))) - BUILD_DEPS += , libatomic-ops-dev (>= 7.3~alpha1+git20110913-1)$(OOO_NO_BE_ARCHS) - endif - ifneq (,$(filter firebird, $(SYSTEM_STUFF))) - BUILD_DEPS += , firebird-dev (>= 2.5.2.26540.ds4-2)$(OOO_NO_LE_ARCHS) - # no FIREBIRD_CFLAGS here. Have no effect as fb_config is there - # and configure prefers that over our values... - endif + BUILD_DEPS += $(call add_system_dep, libatomic-ops, libatomic-ops-dev (>= 7.3~alpha1+git20110913-1)$(OOO_NO_BE_ARCHS)) + BUILD_DEPS += $(call add_system_dep, firebird, firebird-dev (>= 2.5.2.26540.ds4-2)$(OOO_NO_LE_ARCHS)) + # no FIREBIRD_CFLAGS here. Have no effect as fb_config is there + # and configure prefers that over our values... else CONFIGURE_FLAGS += --disable-firebird-sdbc endif @@ -1240,9 +1146,8 @@ else endif ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y" - ifneq (,$(filter postgresql, $(SYSTEM_STUFF))) - BUILD_DEPS += , libpq-dev (>= 9.0~) - else + BUILD_DEPS += $(call add_system_dep, postgresql, libpq-dev (>= 9.0~)) + ifeq (,$(filter postgresql, $(SYSTEM_STUFF))) BUILD_DEPS += , libkrb5-dev endif else @@ -1268,8 +1173,8 @@ else endif ifeq "$(ENABLE_JAVA)" "y" + BUILD_DEPS += $(call add_system_dep, hsqldb, libhsqldb1.8.0-java $(HSQLDB_MINVER)$(OOO_NO_JAVA_ARCHS)) ifneq (,$(filter hsqldb, $(SYSTEM_STUFF))) - BUILD_DEPS += , libhsqldb1.8.0-java $(HSQLDB_MINVER)$(OOO_NO_JAVA_ARCHS) BASE_HSQLDB_DEPENDS = libhsqldb1.8.0-java $(HSQLDB_MINVER) JAVA_GCJ_DEPENDS += , libhsqldb1.8.0-java-gcj [$(OOO_GCJ_ARCHS)] CONFIGURE_FLAGS += --with-hsqldb-jar=$(HSQLDB_JAR) @@ -1316,9 +1221,7 @@ ifeq "$(USE_DBUS)" "y" BUILD_DEPS += , libdbus-glib-1-dev (>= 0.70) CONFIGURE_FLAGS += --enable-dbus ifeq "$(ENABLE_BLUETOOTH)" "y" - ifneq (,$(filter bluez, $(SYSTEM_STUFF))) - BUILD_DEPS += , libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386] - endif + BUILD_DEPS += $(call add_system_dep, bluez, libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386]) else CONFIGURE_FLAGS += --disable-sdremote-bluetooth endif @@ -1381,17 +1284,13 @@ ifeq "$(ENABLE_HELP)" "n" CONFIGURE_FLAGS += --without-helppack-integration --without-help endif +BUILD_DEPS += $(call add_system_dep, redland, librdf0-dev (>= 1.0.16-2)) ifneq (,$(filter redland, $(SYSTEM_STUFF))) - BUILD_DEPS += , librdf0-dev (>= 1.0.16-2) SHLIBS_OVERRIDE += -Xunordf endif -ifneq (,$(filter glew, $(SYSTEM_STUFF))) - BUILD_DEPS += , libglew-dev -endif -ifneq (,$(filter glm, $(SYSTEM_STUFF))) - BUILD_DEPS += , libglm-dev -endif +BUILD_DEPS += $(call add_system_dep, glew, libglew-dev) +BUILD_DEPS += $(call add_system_dep, glm, libglm-dev) ifeq "$(ENABLE_GIO)" "y" BUILD_DEPS += , libglib2.0-dev (>= 2.15.0) -- 2.1.1
>From e3da0d621f45891fb3fdbab7e06e2a357f5944b7 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen <[email protected]> Date: Wed, 22 Oct 2014 21:01:49 -0400 Subject: [PATCH 2/3] collect and sort all unconditional add_system_deps --- rules | 88 +++++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 46 insertions(+), 42 deletions(-) diff --git a/rules b/rules index baec2a5..683734b 100755 --- a/rules +++ b/rules @@ -665,7 +665,6 @@ endif BUILDDEB_OPTIONS ?= -- -Zxz -BUILD_DEPS += $(call add_system_dep, mesa-headers, libgl1-mesa-dev$(COMMA) libglu1-mesa-dev) ifneq "$(ENABLE_OPENGL)" "y" CONFIGURE_FLAGS += --disable-opengl @@ -702,23 +701,13 @@ else CONFIGURE_FLAGS += --disable-graphite endif -BUILD_DEPS += $(call add_system_dep, harfbuzz, libharfbuzz-dev (>= 0.9.18)) - -BUILD_DEPS += $(call add_system_dep, libexttextcat, libexttextcat-dev (>= 3.1.1)) ifneq (,$(filter libexttextcat, $(SYSTEM_STUFF))) TEXTCAT_DATA_RECOMMENDS := libexttextcat-data endif -BUILD_DEPS += $(call add_system_dep, jpeg, libjpeg-dev) -BUILD_DEPS += $(call add_system_dep, libxml, libxml2-dev$(COMMA) libxml2-utils$(COMMA) libxslt1-dev) ifneq (,$(filter libxml, $(SYSTEM_STUFF))) DBG_DBG_SUGGESTS+= , libxslt1-dbg endif -BUILD_DEPS += $(call add_system_dep, expat, libexpat1-dev) -BUILD_DEPS += $(call add_system_dep, odbc, unixodbc-dev (>= 2.2.11)) -BUILD_DEPS += $(call add_system_dep, sane, libsane-dev) -BUILD_DEPS += $(call add_system_dep, libpng, libpng12-dev) -BUILD_DEPS += $(call add_system_dep, curl, libcurl4-$(CURL_SECTYPE)-dev) ifneq ($(ENABLE_COINMP),y) CONFIGURE_FLAGS += --disable-coinmp @@ -726,7 +715,6 @@ else BUILD_DEPS += , coinor-libcoinmp-dev, coinor-libcoinutils-dev endif -BUILD_DEPS += $(call add_system_dep, openssl, libssl-dev (>= 0.9.8)) ifneq (,$(filter openssl, $(SYSTEM_STUFF))) DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/$(DEB_HOST_MULTIARCH)/libssl.so | cut -d"." -f3,4,5)-dbg endif @@ -796,7 +784,6 @@ endif ifeq "$(RUN_TESTTOOL)" "y" CONFIGURE_FLAGS += --enable-hids endif -BUILD_DEPS += $(call add_system_dep, cppunit, libcppunit-dev (>= 1.12)) ifeq "$(RUN_MAKE_CHECK)" "y" BUILD_DEPS += , gdb BUILD_DEPS += , fontconfig @@ -972,11 +959,9 @@ else DEBHELPER_OPTIONS += -Nlibreoffice-officebean -Nlibreoffice-java-common -Nlibreoffice-gcj -Nlibreoffice-script-provider-bsh -Nlibreoffice-script-provider-js endif -BUILD_DEPS += $(call add_system_dep, nss, libnss3-dev (>= 3.12.3)) ifneq (,$(filter nss, $(SYSTEM_STUFF))) DBG_DBG_SUGGESTS+= , libnss3-dbg endif -BUILD_DEPS += $(call add_system_dep, npapi-headers, $(if $(filter y, $(WHEEZY_BACKPORT)), xulrunner-dev, npapi-sdk-dev)) ifeq "$(USE_UCPP)" "y" ifneq (,$(filter ucpp, $(SYSTEM_STUFF))) @@ -991,10 +976,8 @@ else endif BUILD_DEPS += , $(IDLC_CPP_DEPENDS) -BUILD_DEPS += $(call add_system_dep, hunspell, libhunspell-dev $(HUNSPELL_MIN_VER)) CONFIGURE_FLAGS += --with-external-dict-dir=$(DICT_DIR) -BUILD_DEPS += $(call add_system_dep, altlinuxhyph, $(if $(filter y,$(USE_LIBHYPHEN)), libhyphen-dev $(LIBHYPHEN_MINVER), libaltlinuxhyph-dev $(LIBALTLINUXHYPH_MINVER))) CONFIGURE_FLAGS += --with-external-hyph-dir=$(HYPH_DIR) ifneq (,$(filter boost, $(SYSTEM_STUFF))) @@ -1024,7 +1007,6 @@ ifneq (,$(filter boost, $(SYSTEM_STUFF))) endif endif -BUILD_DEPS += $(call add_system_dep, mdds, libmdds-dev (>= 0.10.3)) ifeq "$(ENABLE_ORCUS)" "y" BUILD_DEPS += $(call add_system_dep, orcus, liborcus-dev (>= 0.7.0)) @@ -1032,26 +1014,54 @@ else CONFIGURE_FLAGS += --disable-orcus endif -BUILD_DEPS += $(call add_system_dep, vigra, libvigraimpex-dev) -BUILD_DEPS += $(call add_system_dep, clucene, libclucene-dev (>= 2.3.3.4-2)) + +BUILD_DEPS += \ + $(call add_system_dep, altlinuxhyph , $(if $(filter y,$(USE_LIBHYPHEN)), libhyphen-dev $(LIBHYPHEN_MINVER), libaltlinuxhyph-dev $(LIBALTLINUXHYPH_MINVER))) \ + $(call add_system_dep, clucene , libclucene-dev (>= 2.3.3.4-2)) \ + $(call add_system_dep, cppunit , libcppunit-dev (>= 1.12)) \ + $(call add_system_dep, curl , libcurl4-$(CURL_SECTYPE)-dev) \ + $(call add_system_dep, expat , libexpat1-dev) \ + $(call add_system_dep, glew , libglew-dev) \ + $(call add_system_dep, glm , libglm-dev) \ + $(call add_system_dep, harfbuzz , libharfbuzz-dev (>= 0.9.18)) \ + $(call add_system_dep, hunspell , libhunspell-dev $(HUNSPELL_MIN_VER)) \ + $(call add_system_dep, icu , libicu-dev $(ICU_MINVER)) \ + $(call add_system_dep, jpeg , libjpeg-dev) \ + $(call add_system_dep, lcms2 , liblcms2-dev) \ + $(call add_system_dep, libexttextcat, libexttextcat-dev (>= 3.1.1)) \ + $(call add_system_dep, libpng , libpng12-dev) \ + $(call add_system_dep, libxml , libxml2-dev$(COMMA) libxml2-utils$(COMMA) libxslt1-dev) \ + $(call add_system_dep, mdds , libmdds-dev (>= 0.10.3)) \ + $(call add_system_dep, mesa-headers , libgl1-mesa-dev$(COMMA) libglu1-mesa-dev) \ + $(call add_system_dep, npapi-headers, $(if $(filter y, $(WHEEZY_BACKPORT)), xulrunner-dev, npapi-sdk-dev)) \ + $(call add_system_dep, nss , libnss3-dev (>= 3.12.3)) \ + $(call add_system_dep, odbc , unixodbc-dev (>= 2.2.11)) \ + $(call add_system_dep, openldap , libldap2-dev) \ + $(call add_system_dep, openssl , libssl-dev (>= 0.9.8)) \ + $(call add_system_dep, redland , librdf0-dev (>= 1.0.16-2)) \ + $(call add_system_dep, sane , libsane-dev) \ + $(call add_system_dep, vigra , libvigraimpex-dev) \ + ifeq "$(USE_EXTERNAL_CXXLIBS)" "y" - BUILD_DEPS += $(call add_system_dep, librevenge, librevenge-dev) - BUILD_DEPS += $(call add_system_dep, libwpd, libwpd-dev (>= 0.10)) - BUILD_DEPS += $(call add_system_dep, mythes, libmythes-dev (>= 2:1.2)) - BUILD_DEPS += $(call add_system_dep, libwps, libwps-dev (>= 0.3)) - BUILD_DEPS += $(call add_system_dep, libwpg, libwpg-dev (>= 0.3)) - BUILD_DEPS += $(call add_system_dep, libvisio, libvisio-dev (>= 0.1)) - BUILD_DEPS += $(call add_system_dep, libcdr, libcdr-dev (>= 0.1)) - BUILD_DEPS += $(call add_system_dep, libmspub, libmspub-dev (>= 0.1)) - BUILD_DEPS += $(call add_system_dep, libmwaw, libmwaw-dev (>= 0.3.3)) - BUILD_DEPS += $(call add_system_dep, libodfgen, libodfgen-dev (>= 0.1)) - BUILD_DEPS += $(call add_system_dep, libetonyek, libetonyek-dev (>= 0.1.1)) - BUILD_DEPS += $(call add_system_dep, libfreehand, libfreehand-dev (>= 0.1)) - BUILD_DEPS += $(call add_system_dep, libabw, libabw-dev (>= 0.1)) - BUILD_DEPS += $(call add_system_dep, libpagemaker, libpagemaker-dev) - BUILD_DEPS += $(call add_system_dep, libebook, libe-book-dev (>= 0.1.1)) - BUILD_DEPS += $(call add_system_dep, libcmis, libcmis-dev (>= 0.4.0)) +BUILD_DEPS += \ + $(call add_system_dep, libabw , libabw-dev (>= 0.1)) \ + $(call add_system_dep, libcdr , libcdr-dev (>= 0.1)) \ + $(call add_system_dep, libcmis , libcmis-dev (>= 0.4.0)) \ + $(call add_system_dep, libebook , libe-book-dev (>= 0.1.1)) \ + $(call add_system_dep, libetonyek , libetonyek-dev (>= 0.1.1)) \ + $(call add_system_dep, libfreehand , libfreehand-dev (>= 0.1)) \ + $(call add_system_dep, libmspub , libmspub-dev (>= 0.1)) \ + $(call add_system_dep, libmwaw , libmwaw-dev (>= 0.3.3)) \ + $(call add_system_dep, libodfgen , libodfgen-dev (>= 0.1)) \ + $(call add_system_dep, libpagemaker, libpagemaker-dev) \ + $(call add_system_dep, librevenge , librevenge-dev) \ + $(call add_system_dep, libvisio , libvisio-dev (>= 0.1)) \ + $(call add_system_dep, libwpd , libwpd-dev (>= 0.10)) \ + $(call add_system_dep, libwpg , libwpg-dev (>= 0.3)) \ + $(call add_system_dep, libwps , libwps-dev (>= 0.3)) \ + $(call add_system_dep, mythes , libmythes-dev (>= 2:1.2)) \ + endif CONFIGURE_FLAGS += --with-external-thes-dir=$(THES_DIR) @@ -1060,8 +1070,6 @@ ifeq "$(ENABLE_EOT)" "y" BUILD_DEPS += $(call add_system_dep, libeot, libeot-dev) endif -BUILD_DEPS += $(call add_system_dep, lcms2, liblcms2-dev) -BUILD_DEPS += $(call add_system_dep, openldap, libldap2-dev) ifeq ($(ENABLE_TELEPATHY),y) BUILD_DEPS += , libtelepathy-glib-dev (>= 0.18) @@ -1074,7 +1082,6 @@ else CONFIGURE_FLAGS += --disable-liblangtag endif -BUILD_DEPS += $(call add_system_dep, icu, libicu-dev $(ICU_MINVER)) ifeq "$(BUILD_CAIROCANVAS)" "y" BUILD_DEPS += $(call add_system_dep, cairo, libcairo2-dev) @@ -1284,13 +1291,10 @@ ifeq "$(ENABLE_HELP)" "n" CONFIGURE_FLAGS += --without-helppack-integration --without-help endif -BUILD_DEPS += $(call add_system_dep, redland, librdf0-dev (>= 1.0.16-2)) ifneq (,$(filter redland, $(SYSTEM_STUFF))) SHLIBS_OVERRIDE += -Xunordf endif -BUILD_DEPS += $(call add_system_dep, glew, libglew-dev) -BUILD_DEPS += $(call add_system_dep, glm, libglm-dev) ifeq "$(ENABLE_GIO)" "y" BUILD_DEPS += , libglib2.0-dev (>= 2.15.0) -- 2.1.1
>From 82944e5eb59ce3062b4b7b700a09f3dff9f33388 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen <[email protected]> Date: Wed, 22 Oct 2014 21:02:48 -0400 Subject: [PATCH 3/3] testtool is long dead --- rules | 3 --- 1 file changed, 3 deletions(-) diff --git a/rules b/rules index 683734b..bf5d072 100755 --- a/rules +++ b/rules @@ -781,9 +781,6 @@ ifeq "$(ENABLE_JAVA)" "y" endif endif -ifeq "$(RUN_TESTTOOL)" "y" - CONFIGURE_FLAGS += --enable-hids -endif ifeq "$(RUN_MAKE_CHECK)" "y" BUILD_DEPS += , gdb BUILD_DEPS += , fontconfig -- 2.1.1
