summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2021-11-22 14:36:30 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2021-11-25 17:18:15 +0100
commitc2a935cceaf44dc325038b0118e5a7348a0951e0 (patch)
treefe5c1c49d8096526ecb7ddfd5031e3a82c6169a4
parentcb07f4049757394cf30bf49aee3a3f316e970642 (diff)
downloadptxdist-c2a935cceaf44dc325038b0118e5a7348a0951e0.tar.gz
ptxdist-c2a935cceaf44dc325038b0118e5a7348a0951e0.tar.xz
glib: drop internal_pcre option
This option was removed in commit 9fbd7f3dc1f0 ("build: Drop the internal_pcre option in favour of the subproject"), contained in version 2.69.0. Fixes: 20d3f539a7f8 ("glib: Version bump. 2.68.3 -> 2.70.0") Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Message-Id: <20211122133630.1771606-1-p.zabel@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/glib.make1
-rw-r--r--rules/host-glib.make1
2 files changed, 0 insertions, 2 deletions
diff --git a/rules/glib.make b/rules/glib.make
index 13d397993..ac65f8027 100644
--- a/rules/glib.make
+++ b/rules/glib.make
@@ -47,7 +47,6 @@ GLIB_CONF_OPT := \
-Dgtk_doc=false \
-Diconv=libc \
-Dinstalled_tests=false \
- -Dinternal_pcre=false \
-Dlibelf=disabled \
-Dlibmount=$(call ptx/endis, PTXCONF_GLIB_LIBMOUNT)d \
-Dman=false \
diff --git a/rules/host-glib.make b/rules/host-glib.make
index ba80b70f2..c062ad884 100644
--- a/rules/host-glib.make
+++ b/rules/host-glib.make
@@ -36,7 +36,6 @@ HOST_GLIB_CONF_OPT := \
-Dgtk_doc=false \
-Diconv=libc \
-Dinstalled_tests=false \
- -Dinternal_pcre=false \
-Dlibelf=disabled \
-Dlibmount=disabled \
-Dman=false \