aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Philip Withnall <philip@tecnocode.co.uk>2020-02-07 13:03:31 +0000
committerGravatar GitHub <noreply@github.com>2020-02-07 05:03:31 -0800
commitb036df0ce156022abd686dbaa0de4e919768d0dd (patch)
tree45673342bcc4a8e325e09cf7338b088911d98455
parenta32769e89a9b1d7a334c31e952ea57352063de69 (diff)
glib: Fix build due to Meson option changing type (#3358)
* glib: Fix build due to Meson option changing type In GLib master commit b220033c we changed the `libmount` option from a `boolean` to a `feature`, which means it now takes `enabled`/`disabled`/`auto` rather than `true`/`false`. Signed-off-by: Philip Withnall <philip@tecnocode.co.uk> Fixes: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=20552 * glib: Fix homepage URI The FSF page on GLib is not official, loaded with their advertising, and quite out of date. Signed-off-by: Philip Withnall <philip@tecnocode.co.uk> * infra: Add help_url to the valid section names list in Travis checks It’s documented as valid: https://google.github.io/oss-fuzz/getting-started/new-project-guide/#help_url Signed-off-by: Philip Withnall <philip@tecnocode.co.uk>
-rwxr-xr-xinfra/presubmit.py1
-rwxr-xr-xprojects/glib/build.sh2
-rw-r--r--projects/glib/project.yaml2
3 files changed, 3 insertions, 2 deletions
diff --git a/infra/presubmit.py b/infra/presubmit.py
index 7be16a80..71da8fd9 100755
--- a/infra/presubmit.py
+++ b/infra/presubmit.py
@@ -90,6 +90,7 @@ class ProjectYamlChecker:
'vendor_ccs',
'view_restrictions',
'language',
+ 'help_url',
]
LANGUAGES_SUPPORTED = ['c', 'cpp', 'go', 'rust', 'python']
diff --git a/projects/glib/build.sh b/projects/glib/build.sh
index 4b4ac079..b0d8f397 100755
--- a/projects/glib/build.sh
+++ b/projects/glib/build.sh
@@ -24,7 +24,7 @@ meson $BUILD \
-Doss_fuzz=enabled \
-Db_lundef=false \
-Ddefault_library=static \
- -Dlibmount=false
+ -Dlibmount=disabled
ninja -C $BUILD
diff --git a/projects/glib/project.yaml b/projects/glib/project.yaml
index 90a03d0c..03db5130 100644
--- a/projects/glib/project.yaml
+++ b/projects/glib/project.yaml
@@ -1,4 +1,4 @@
-homepage: "https://www.gnu.org/directory/glib.html"
+homepage: "https://gitlab.gnome.org/GNOME/glib/"
primary_contact: "bugzilla@tecnocode.co.uk"
auto_ccs:
- philip.withnall@gmail.com