[Libreoffice-commits] core.git: 3 commits - external/glm external/hyphen external/jpeg external/libatomic_ops external/libpng external/libzmf external/Module_external.mk external/nss external/openldap external/openssl external/poppler external/postgresql external/python3 external/python33 external/redland external/zlib
David Tardon
dtardon at redhat.com
Sun Oct 23 18:14:06 UTC 2016
external/Module_external.mk | 2
external/glm/Module_glm.mk | 4
external/hyphen/Module_hyphen.mk | 4
external/jpeg/Module_jpeg.mk | 4
external/libatomic_ops/Module_libatomic_ops.mk | 4
external/libpng/Module_libpng.mk | 4
external/libzmf/0001-allow-build-with-boost-1.56-part-II.patch.1 | 190 ++++++++++
external/libzmf/0001-allow-build-with-boost-1.56.patch.1 | 131 ++++++
external/libzmf/UnpackedTarball_libzmf.mk | 2
external/nss/Module_nss.mk | 2
external/openldap/Module_openldap.mk | 4
external/openssl/Module_openssl.mk | 2
external/poppler/Module_poppler.mk | 4
external/postgresql/Module_postgresql.mk | 4
external/python3/Module_python3.mk | 2
external/python33/Module_python33.mk | 2
external/redland/Module_redland.mk | 2
external/zlib/Module_zlib.mk | 4
18 files changed, 324 insertions(+), 47 deletions(-)
New commits:
commit bc3ea81d78687c9383e899ddcd81422392a6ecee
Author: David Tardon <dtardon at redhat.com>
Date: Sun Oct 23 20:08:52 2016 +0200
fix build of bundled libzmf with boost < 1.56
Change-Id: I024d77b563d492bbb56155afb6313d37ca6a4c0b
diff --git a/external/libzmf/0001-allow-build-with-boost-1.56-part-II.patch.1 b/external/libzmf/0001-allow-build-with-boost-1.56-part-II.patch.1
new file mode 100644
index 0000000..d70fd97
--- /dev/null
+++ b/external/libzmf/0001-allow-build-with-boost-1.56-part-II.patch.1
@@ -0,0 +1,190 @@
+From 11b8d5b0c8c0461ac638aba6bc6e59e7ec5d815c Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Sun, 23 Oct 2016 19:58:35 +0200
+Subject: [PATCH] allow build with boost < 1.56, part II
+
+Change-Id: I4421847b1aa7bbb006a32dd85567b96125df6b6b
+---
+ src/lib/ZMF4Parser.cpp | 42 +++++++++++++++++++++---------------------
+ 1 file changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/src/lib/ZMF4Parser.cpp b/src/lib/ZMF4Parser.cpp
+index e23c2e5..f3f3f5d 100644
+--- a/src/lib/ZMF4Parser.cpp
++++ b/src/lib/ZMF4Parser.cpp
+@@ -269,7 +269,7 @@ boost::optional<Image> ZMF4Parser::getImageByRefId(uint32_t id)
+ ArrowPtr ZMF4Parser::getArrowByRefId(uint32_t id)
+ {
+ auto arrow = getByRefId<ArrowPtr>(id, m_arrows);
+- return arrow ? arrow.value() : ArrowPtr();
++ return get_optional_value_or(arrow, ArrowPtr());
+ }
+
+ Style ZMF4Parser::readStyle()
+@@ -684,13 +684,13 @@ void ZMF4Parser::readFill()
+
+ Color color = readColor();
+
+- m_fills[m_currentObjectHeader.id.value()] = color;
++ m_fills[get(m_currentObjectHeader.id)] = color;
+ }
+ else if (type >= 2 && type <= 7)
+ {
+ Gradient gradient = readGradient(type);
+
+- m_fills[m_currentObjectHeader.id.value()] = gradient;
++ m_fills[get(m_currentObjectHeader.id)] = gradient;
+ }
+ else if (type == 8)
+ {
+@@ -723,13 +723,13 @@ void ZMF4Parser::readFill()
+
+ if (!image)
+ {
+- ZMF_DEBUG_MSG(("image not found for bitmap fill ID0x%x\n", m_currentObjectHeader.id.value()));
++ ZMF_DEBUG_MSG(("image not found for bitmap fill ID0x%x\n", get(m_currentObjectHeader.id)));
+ return;
+ }
+
+- imageFill.image = image.value();
++ imageFill.image = get(image);
+
+- m_fills[m_currentObjectHeader.id.value()] = imageFill;
++ m_fills[get(m_currentObjectHeader.id)] = imageFill;
+ }
+ else
+ {
+@@ -756,7 +756,7 @@ void ZMF4Parser::readTransparency()
+ Transparency transparency;
+ transparency.color = readColor();
+
+- m_transparencies[m_currentObjectHeader.id.value()] = transparency;
++ m_transparencies[get(m_currentObjectHeader.id)] = transparency;
+ }
+ }
+
+@@ -874,7 +874,7 @@ void ZMF4Parser::readPen()
+ }
+ }
+
+- m_pens[m_currentObjectHeader.id.value()] = pen;
++ m_pens[get(m_currentObjectHeader.id)] = pen;
+ }
+
+ void ZMF4Parser::readShadow()
+@@ -926,7 +926,7 @@ void ZMF4Parser::readShadow()
+ break;
+ }
+
+- m_shadows[m_currentObjectHeader.id.value()] = shadow;
++ m_shadows[get(m_currentObjectHeader.id)] = shadow;
+ }
+
+ void ZMF4Parser::readArrow()
+@@ -947,7 +947,7 @@ void ZMF4Parser::readArrow()
+
+ arrow->curves = readCurveComponents(std::bind(&ZMF4Parser::readUnscaledPoint, this));
+
+- m_arrows[m_currentObjectHeader.id.value()] = arrow;
++ m_arrows[get(m_currentObjectHeader.id)] = arrow;
+ }
+
+ void ZMF4Parser::readBitmap()
+@@ -975,11 +975,11 @@ void ZMF4Parser::readBitmap()
+
+ if (image.data.empty())
+ {
+- ZMF_DEBUG_MSG(("Failed to parse bitmap, ID 0x%x\n", m_currentObjectHeader.id.value()));
++ ZMF_DEBUG_MSG(("Failed to parse bitmap, ID 0x%x\n", get(m_currentObjectHeader.id)));
+ }
+ else
+ {
+- m_images[m_currentObjectHeader.id.value()] = image;
++ m_images[get(m_currentObjectHeader.id)] = image;
+ }
+
+ seek(m_input, m_currentObjectHeader.nextObjectOffset + header.size());
+@@ -1012,7 +1012,7 @@ void ZMF4Parser::readImage()
+ {
+ m_collector.setStyle(readStyle());
+
+- m_collector.collectImage(image.value().data, bbox.topLeft(), bbox.width(), bbox.height(),
++ m_collector.collectImage(get(image).data, bbox.topLeft(), bbox.width(), bbox.height(),
+ bbox.rotation(), bbox.mirrorHorizontal(), bbox.mirrorVertical());
+ }
+ }
+@@ -1046,7 +1046,7 @@ void ZMF4Parser::readFont()
+ font.fill = style.fill;
+ font.outline = style.pen;
+
+- m_fonts[m_currentObjectHeader.id.value()] = font;
++ m_fonts[get(m_currentObjectHeader.id)] = font;
+ }
+
+ void ZMF4Parser::readParagraphStyle()
+@@ -1098,7 +1098,7 @@ void ZMF4Parser::readParagraphStyle()
+ {
+ auto font = getFontByRefId(ref.id);
+ if (font)
+- parStyle.font = font.value();
++ parStyle.font = get(font);
+ }
+ break;
+ default:
+@@ -1107,7 +1107,7 @@ void ZMF4Parser::readParagraphStyle()
+ }
+ }
+
+- m_paragraphStyles[m_currentObjectHeader.id.value()] = parStyle;
++ m_paragraphStyles[get(m_currentObjectHeader.id)] = parStyle;
+ }
+
+ void ZMF4Parser::readText()
+@@ -1140,7 +1140,7 @@ void ZMF4Parser::readText()
+ uint32_t styleId = readU32(m_input);
+ auto style = getParagraphStyleByRefId(styleId);
+ if (style)
+- paragraph.style = style.value();
++ paragraph.style = get(style);
+
+ skip(m_input, 4);
+ }
+@@ -1161,7 +1161,7 @@ void ZMF4Parser::readText()
+ uint32_t fontId = readU32(m_input);
+ auto font = getFontByRefId(fontId);
+ if (font)
+- span.font = font.value();
++ span.font = get(font);
+ else
+ {
+ span.font = paragraph.style.font;
+@@ -1180,7 +1180,7 @@ void ZMF4Parser::readText()
+ }
+ }
+
+- m_texts[m_currentObjectHeader.id.value()] = text;
++ m_texts[get(m_currentObjectHeader.id)] = text;
+ }
+
+ void ZMF4Parser::readTextFrame()
+@@ -1216,7 +1216,7 @@ void ZMF4Parser::readTextFrame()
+
+ if (text)
+ {
+- m_collector.collectTextObject(text.value(), bbox.topLeft(), bbox.width(), bbox.height(), alignment, bbox.rotation());
++ m_collector.collectTextObject(get(text), bbox.topLeft(), bbox.width(), bbox.height(), alignment, bbox.rotation());
+ }
+ }
+
+@@ -1350,7 +1350,7 @@ void ZMF4Parser::readTable()
+ auto text = getTextByRefId(textId);
+ if (text)
+ {
+- cell.text = text.value();
++ cell.text = get(text);
+ }
+
+ uint32_t rightPenRefId = readU32(m_input);
+--
+2.9.3
+
diff --git a/external/libzmf/0001-allow-build-with-boost-1.56.patch.1 b/external/libzmf/0001-allow-build-with-boost-1.56.patch.1
new file mode 100644
index 0000000..0873381
--- /dev/null
+++ b/external/libzmf/0001-allow-build-with-boost-1.56.patch.1
@@ -0,0 +1,131 @@
+From 16d921505a56745f671525310ebb4b3c58b35afe Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Sun, 23 Oct 2016 19:46:18 +0200
+Subject: [PATCH] allow build with boost < 1.56
+
+Change-Id: I81a110fc19e1540980a265c773bd840c47643d86
+---
+ src/lib/ZMFCollector.cpp | 32 ++++++++++++++++----------------
+ 1 file changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/src/lib/ZMFCollector.cpp b/src/lib/ZMFCollector.cpp
+index 18377ff..0b2608f 100644
+--- a/src/lib/ZMFCollector.cpp
++++ b/src/lib/ZMFCollector.cpp
+@@ -218,7 +218,7 @@ public:
+
+ if (m_transparency)
+ {
+- m_propList.insert("draw:opacity", m_transparency.value().opacity(), librevenge::RVNG_PERCENT);
++ m_propList.insert("draw:opacity", get(m_transparency).opacity(), librevenge::RVNG_PERCENT);
+ }
+ }
+
+@@ -251,7 +251,7 @@ public:
+ librevenge::RVNGPropertyList grad;
+ grad.insert("svg:offset", stop.offset, librevenge::RVNG_PERCENT);
+ grad.insert("svg:stop-color", stop.color.toString());
+- grad.insert("svg:stop-opacity", m_transparency ? m_transparency.value().opacity() : 1.0, librevenge::RVNG_PERCENT);
++ grad.insert("svg:stop-opacity", m_transparency ? get(m_transparency).opacity() : 1.0, librevenge::RVNG_PERCENT);
+ gradientVector.append(grad);
+ }
+
+@@ -294,7 +294,7 @@ public:
+
+ if (m_transparency)
+ {
+- m_propList.insert("draw:opacity", m_transparency.value().opacity(), librevenge::RVNG_PERCENT);
++ m_propList.insert("draw:opacity", get(m_transparency).opacity(), librevenge::RVNG_PERCENT);
+ }
+ }
+
+@@ -667,9 +667,9 @@ void ZMFCollector::collectText(const Text &text)
+ spanPropList.insert("fo:font-style", span.font.isItalic ? "italic" : "normal");
+ spanPropList.insert("style:text-outline", static_cast<bool>(span.font.outline));
+
+- if (span.font.fill && span.font.fill.value().type() == typeid(Color))
++ if (span.font.fill && get(span.font.fill).type() == typeid(Color))
+ {
+- auto color = boost::get<Color>(span.font.fill.value());
++ auto color = boost::get<Color>(get(span.font.fill));
+ spanPropList.insert("fo:color", color.toString());
+ }
+
+@@ -759,9 +759,9 @@ void ZMFCollector::collectTable(const Table &table)
+ {
+ librevenge::RVNGPropertyList cellPropList;
+
+- if (cell.fill && cell.fill.value().type() == typeid(Color))
++ if (cell.fill && get(cell.fill).type() == typeid(Color))
+ {
+- auto backgroundColor = boost::get<Color>(cell.fill.value());
++ auto backgroundColor = boost::get<Color>(get(cell.fill));
+ cellPropList.insert("fo:background-color", backgroundColor.toString());
+ }
+
+@@ -769,19 +769,19 @@ void ZMFCollector::collectTable(const Table &table)
+
+ if (cell.leftBorder)
+ {
+- writeBorder(cellPropList, "fo:border-left", cell.leftBorder.value());
++ writeBorder(cellPropList, "fo:border-left", get(cell.leftBorder));
+ }
+ if (cell.rightBorder)
+ {
+- writeBorder(cellPropList, "fo:border-right", cell.rightBorder.value());
++ writeBorder(cellPropList, "fo:border-right", get(cell.rightBorder));
+ }
+ if (cell.topBorder)
+ {
+- writeBorder(cellPropList, "fo:border-top", cell.topBorder.value());
++ writeBorder(cellPropList, "fo:border-top", get(cell.topBorder));
+ }
+ if (cell.bottomBorder)
+ {
+- writeBorder(cellPropList, "fo:border-bottom", cell.bottomBorder.value());
++ writeBorder(cellPropList, "fo:border-bottom", get(cell.bottomBorder));
+ }
+
+ m_painter->openTableCell(cellPropList);
+@@ -806,7 +806,7 @@ void ZMFCollector::collectImage(const librevenge::RVNGBinaryData &image, const P
+
+ if (m_style.transparency)
+ {
+- propList.insert("draw:opacity", m_style.transparency.value().opacity(), librevenge::RVNG_PERCENT);
++ propList.insert("draw:opacity", get(m_style.transparency).opacity(), librevenge::RVNG_PERCENT);
+ }
+
+ m_painter->setStyle(propList);
+@@ -847,17 +847,17 @@ void ZMFCollector::writeStyle(librevenge::RVNGPropertyList &propList, const Styl
+
+ if (style.pen)
+ {
+- writePen(propList, style.pen.value());
++ writePen(propList, get(style.pen));
+ }
+
+ if (style.fill && !noFill)
+ {
+- writeFill(propList, style.fill.value());
++ writeFill(propList, get(style.fill));
+ }
+
+ if (style.shadow)
+ {
+- writeShadow(propList, style.shadow.value());
++ writeShadow(propList, get(style.shadow));
+ }
+ }
+
+@@ -920,7 +920,7 @@ void ZMFCollector::writePen(librevenge::RVNGPropertyList &propList, const Pen &p
+
+ if (m_style.transparency)
+ {
+- propList.insert("svg:stroke-opacity", m_style.transparency.value().opacity(), librevenge::RVNG_PERCENT);
++ propList.insert("svg:stroke-opacity", get(m_style.transparency).opacity(), librevenge::RVNG_PERCENT);
+ }
+
+ if (pen.startArrow)
+--
+2.9.3
+
diff --git a/external/libzmf/UnpackedTarball_libzmf.mk b/external/libzmf/UnpackedTarball_libzmf.mk
index c917633..782aeb8 100644
--- a/external/libzmf/UnpackedTarball_libzmf.mk
+++ b/external/libzmf/UnpackedTarball_libzmf.mk
@@ -23,6 +23,8 @@ endif
$(eval $(call gb_UnpackedTarball_add_patches,libzmf, \
external/libzmf/0001-add-missing-include.patch.1 \
+ external/libzmf/0001-allow-build-with-boost-1.56.patch.1 \
+ external/libzmf/0001-allow-build-with-boost-1.56-part-II.patch.1 \
))
# vim: set noet sw=4 ts=4:
commit bbc99788c3cede767d6f29405f348c347da4a795
Author: David Tardon <dtardon at redhat.com>
Date: Sun Oct 23 10:08:45 2016 +0200
keep the list sorted
Change-Id: I3088032e9980f9f4ae518ab16fb4fdfd35e0aa94
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 3a36869..2089546 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -86,7 +86,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,ORCUS,liborcus) \
$(call gb_Helper_optional,OWNCLOUD_ANDROID_LIB,owncloud-android-lib) \
$(call gb_Helper_optional,PAGEMAKER,libpagemaker) \
- $(call gb_Helper_optional,ZMF,libzmf) \
$(call gb_Helper_optional,POPPLER,poppler) \
$(call gb_Helper_optional,POSTGRESQL,postgresql) \
$(call gb_Helper_optional,PYTHON,$(if $(filter $(PYTHON_VERSION_MINOR),3),python33,python3)) \
@@ -102,6 +101,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,WPS,libwps) \
$(call gb_Helper_optional,XSLTML,xsltml) \
$(call gb_Helper_optional,ZLIB,zlib) \
+ $(call gb_Helper_optional,ZMF,libzmf) \
$(call gb_Helper_optional_for_host,DESKTOP, \
$(if $(WITH_GALLERY_BUILD), \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
commit f595e426e3b715fe110a90edca3cadfa97fa72cb
Author: David Tardon <dtardon at redhat.com>
Date: Sun Oct 23 10:02:21 2016 +0200
cond. build is already handled in Module_external.mk
Change-Id: I5efe3bafc4f0b97578a75dc1f43e6c130a93bc4a
diff --git a/external/glm/Module_glm.mk b/external/glm/Module_glm.mk
index e9ab006..617b067 100644
--- a/external/glm/Module_glm.mk
+++ b/external/glm/Module_glm.mk
@@ -9,12 +9,8 @@
$(eval $(call gb_Module_Module,glm))
-ifeq ($(SYSTEM_GLM),)
-
$(eval $(call gb_Module_add_targets,glm,\
UnpackedTarball_glm \
))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/external/hyphen/Module_hyphen.mk b/external/hyphen/Module_hyphen.mk
index 5d32fb8..527def3 100644
--- a/external/hyphen/Module_hyphen.mk
+++ b/external/hyphen/Module_hyphen.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Module_Module,hyphen))
-ifeq ($(SYSTEM_HYPH),)
-
$(eval $(call gb_Module_add_targets,hyphen,\
UnpackedTarball_hyphen \
))
@@ -29,6 +27,4 @@ $(eval $(call gb_Module_add_targets,hyphen,\
endif # $(COM)
-endif # $(SYSTEM_HYPH)
-
# vim: set noet sw=4 ts=4:
diff --git a/external/jpeg/Module_jpeg.mk b/external/jpeg/Module_jpeg.mk
index 0b45932..3d66f8f 100644
--- a/external/jpeg/Module_jpeg.mk
+++ b/external/jpeg/Module_jpeg.mk
@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,jpeg))
-ifeq ($(SYSTEM_JPEG),)
-
$(eval $(call gb_Module_add_targets,jpeg,\
UnpackedTarball_jpeg \
StaticLibrary_jpeg \
))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/external/libatomic_ops/Module_libatomic_ops.mk b/external/libatomic_ops/Module_libatomic_ops.mk
index 2ea7e54..7dca670 100644
--- a/external/libatomic_ops/Module_libatomic_ops.mk
+++ b/external/libatomic_ops/Module_libatomic_ops.mk
@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,libatomic_ops))
-ifeq ($(SYSTEM_LIBATOMIC_OPS),)
-
$(eval $(call gb_Module_add_targets,libatomic_ops,\
ExternalProject_libatomic_ops \
UnpackedTarball_libatomic_ops \
))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/external/libpng/Module_libpng.mk b/external/libpng/Module_libpng.mk
index 31610d3..afb0016 100644
--- a/external/libpng/Module_libpng.mk
+++ b/external/libpng/Module_libpng.mk
@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,libpng))
-ifeq ($(SYSTEM_LIBPNG),)
-
$(eval $(call gb_Module_add_targets,libpng,\
StaticLibrary_png \
UnpackedTarball_png \
))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/external/nss/Module_nss.mk b/external/nss/Module_nss.mk
index c1e1ab2..69b39f5 100644
--- a/external/nss/Module_nss.mk
+++ b/external/nss/Module_nss.mk
@@ -9,7 +9,6 @@
$(eval $(call gb_Module_Module,nss))
-ifeq ($(SYSTEM_NSS),)
ifeq ($(filter ANDROID,$(OS)),)
$(eval $(call gb_Module_add_targets,nss,\
UnpackedTarball_nss \
@@ -17,6 +16,5 @@ $(eval $(call gb_Module_add_targets,nss,\
ExternalProject_nss \
))
endif
-endif
# vim: set noet sw=4 ts=4:
diff --git a/external/openldap/Module_openldap.mk b/external/openldap/Module_openldap.mk
index c9203b4..c6a22bc 100644
--- a/external/openldap/Module_openldap.mk
+++ b/external/openldap/Module_openldap.mk
@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,openldap))
-ifeq ($(SYSTEM_OPENLDAP),)
-
$(eval $(call gb_Module_add_targets,openldap,\
ExternalProject_openldap \
UnpackedTarball_openldap \
))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/external/openssl/Module_openssl.mk b/external/openssl/Module_openssl.mk
index 002b708..7a03fe5 100644
--- a/external/openssl/Module_openssl.mk
+++ b/external/openssl/Module_openssl.mk
@@ -9,12 +9,10 @@
$(eval $(call gb_Module_Module,openssl))
-ifeq ($(SYSTEM_OPENSSL),)
$(eval $(call gb_Module_add_targets,openssl,\
UnpackedTarball_openssl \
ExternalPackage_openssl \
ExternalProject_openssl \
))
-endif
# vim: set noet sw=4 ts=4:
diff --git a/external/poppler/Module_poppler.mk b/external/poppler/Module_poppler.mk
index 357bc6d..9e9f540 100644
--- a/external/poppler/Module_poppler.mk
+++ b/external/poppler/Module_poppler.mk
@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,poppler))
-ifeq ($(SYSTEM_POPPLER),)
-
$(eval $(call gb_Module_add_targets,poppler,\
ExternalProject_poppler \
UnpackedTarball_poppler \
))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/external/postgresql/Module_postgresql.mk b/external/postgresql/Module_postgresql.mk
index c57260d..1f655c6 100644
--- a/external/postgresql/Module_postgresql.mk
+++ b/external/postgresql/Module_postgresql.mk
@@ -9,13 +9,9 @@
$(eval $(call gb_Module_Module,postgresql))
-ifeq ($(SYSTEM_POSTGRESQL),)
-
$(eval $(call gb_Module_add_targets,postgresql,\
ExternalProject_postgresql \
UnpackedTarball_postgresql \
))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/external/python3/Module_python3.mk b/external/python3/Module_python3.mk
index 65e1356..5ef1deb 100644
--- a/external/python3/Module_python3.mk
+++ b/external/python3/Module_python3.mk
@@ -10,7 +10,6 @@
$(eval $(call gb_Module_Module,python3))
ifneq ($(DISABLE_PYTHON),TRUE)
-ifeq ($(SYSTEM_PYTHON),)
$(eval $(call gb_Module_add_targets,python3,\
UnpackedTarball_python3 \
@@ -19,6 +18,5 @@ $(eval $(call gb_Module_add_targets,python3,\
))
endif
-endif
# vim: set noet sw=4 ts=4:
diff --git a/external/python33/Module_python33.mk b/external/python33/Module_python33.mk
index 65e1356..5ef1deb 100644
--- a/external/python33/Module_python33.mk
+++ b/external/python33/Module_python33.mk
@@ -10,7 +10,6 @@
$(eval $(call gb_Module_Module,python3))
ifneq ($(DISABLE_PYTHON),TRUE)
-ifeq ($(SYSTEM_PYTHON),)
$(eval $(call gb_Module_add_targets,python3,\
UnpackedTarball_python3 \
@@ -19,6 +18,5 @@ $(eval $(call gb_Module_add_targets,python3,\
))
endif
-endif
# vim: set noet sw=4 ts=4:
diff --git a/external/redland/Module_redland.mk b/external/redland/Module_redland.mk
index 645e419..adc81b4 100644
--- a/external/redland/Module_redland.mk
+++ b/external/redland/Module_redland.mk
@@ -9,7 +9,6 @@
$(eval $(call gb_Module_Module,redland))
-ifeq ($(SYSTEM_REDLAND),)
$(eval $(call gb_Module_add_targets,redland,\
UnpackedTarball_raptor \
UnpackedTarball_rasqal \
@@ -31,6 +30,5 @@ $(eval $(call gb_Module_add_targets,redland,\
ExternalProject_redland \
))
endif
-endif
# vim: set noet sw=4 ts=4:
diff --git a/external/zlib/Module_zlib.mk b/external/zlib/Module_zlib.mk
index 8f71c50..468cb2d 100644
--- a/external/zlib/Module_zlib.mk
+++ b/external/zlib/Module_zlib.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Module_Module,zlib))
-ifeq ($(SYSTEM_ZLIB),)
-
$(eval $(call gb_Module_add_targets,zlib,\
StaticLibrary_zlib \
UnpackedTarball_zlib \
@@ -22,6 +20,4 @@ $(eval $(call gb_Module_add_targets,zlib,\
))
endif
-endif
-
# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list