From c403f1323908d44fb9abc55047cb80cc543b2cec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= Date: Thu, 21 Sep 2023 12:01:13 +0200 Subject: [PATCH 1/2] goblint-cil build patch to detect more recent gcc See discussion in https://github.com/ocaml/opam-repository/pull/24423 --- .../files/realGccConfigure.patch | 15 +++++++++++++++ packages/goblint-cil/goblint-cil.2.0.0/opam | 1 + .../files/realGccConfigure.patch | 15 +++++++++++++++ packages/goblint-cil/goblint-cil.2.0.1/opam | 1 + 4 files changed, 32 insertions(+) create mode 100644 packages/goblint-cil/goblint-cil.2.0.0/files/realGccConfigure.patch create mode 100644 packages/goblint-cil/goblint-cil.2.0.1/files/realGccConfigure.patch diff --git a/packages/goblint-cil/goblint-cil.2.0.0/files/realGccConfigure.patch b/packages/goblint-cil/goblint-cil.2.0.0/files/realGccConfigure.patch new file mode 100644 index 000000000000..a639ee8d7acf --- /dev/null +++ b/packages/goblint-cil/goblint-cil.2.0.0/files/realGccConfigure.patch @@ -0,0 +1,15 @@ +diff --git a/bin/realGccConfigure.ml b/bin/realGccConfigure.ml +index 738f419e..90337c2f 100644 +--- a/bin/realGccConfigure.ml ++++ b/bin/realGccConfigure.ml +@@ -13,6 +13,10 @@ let is_real_gcc c gcc = + + let gccs = [ + "gcc"; ++ "gcc-16"; ++ "gcc-15"; ++ "gcc-14"; ++ "gcc-13"; + "gcc-12"; + "gcc-11"; + "gcc-10"; diff --git a/packages/goblint-cil/goblint-cil.2.0.0/opam b/packages/goblint-cil/goblint-cil.2.0.0/opam index 203cefab962d..368f16ab8bc2 100644 --- a/packages/goblint-cil/goblint-cil.2.0.0/opam +++ b/packages/goblint-cil/goblint-cil.2.0.0/opam @@ -41,6 +41,7 @@ depends: [ "cppo" "conf-gcc" ] +extra-files: ["realGccConfigure.patch" "md5=8cbe9cc88a05dc7b034b54930b31baed"] conflicts: ["cil"] build: [ ["dune" "subst"] {dev} diff --git a/packages/goblint-cil/goblint-cil.2.0.1/files/realGccConfigure.patch b/packages/goblint-cil/goblint-cil.2.0.1/files/realGccConfigure.patch new file mode 100644 index 000000000000..a639ee8d7acf --- /dev/null +++ b/packages/goblint-cil/goblint-cil.2.0.1/files/realGccConfigure.patch @@ -0,0 +1,15 @@ +diff --git a/bin/realGccConfigure.ml b/bin/realGccConfigure.ml +index 738f419e..90337c2f 100644 +--- a/bin/realGccConfigure.ml ++++ b/bin/realGccConfigure.ml +@@ -13,6 +13,10 @@ let is_real_gcc c gcc = + + let gccs = [ + "gcc"; ++ "gcc-16"; ++ "gcc-15"; ++ "gcc-14"; ++ "gcc-13"; + "gcc-12"; + "gcc-11"; + "gcc-10"; diff --git a/packages/goblint-cil/goblint-cil.2.0.1/opam b/packages/goblint-cil/goblint-cil.2.0.1/opam index d01bce669427..8c7103d66319 100644 --- a/packages/goblint-cil/goblint-cil.2.0.1/opam +++ b/packages/goblint-cil/goblint-cil.2.0.1/opam @@ -41,6 +41,7 @@ depends: [ "cppo" "conf-gcc" ] +extra-files: ["realGccConfigure.patch" "md5=8cbe9cc88a05dc7b034b54930b31baed"] conflicts: ["cil"] build: [ ["dune" "subst"] {dev} From 0616413572413ff344e79200c53cd02325a103ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= Date: Thu, 21 Sep 2023 14:36:00 +0200 Subject: [PATCH 2/2] also register the extra files as patches --- packages/goblint-cil/goblint-cil.2.0.0/opam | 1 + packages/goblint-cil/goblint-cil.2.0.1/opam | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/goblint-cil/goblint-cil.2.0.0/opam b/packages/goblint-cil/goblint-cil.2.0.0/opam index 368f16ab8bc2..248965a44d7e 100644 --- a/packages/goblint-cil/goblint-cil.2.0.0/opam +++ b/packages/goblint-cil/goblint-cil.2.0.0/opam @@ -42,6 +42,7 @@ depends: [ "conf-gcc" ] extra-files: ["realGccConfigure.patch" "md5=8cbe9cc88a05dc7b034b54930b31baed"] +patches: ["realGccConfigure.patch"] conflicts: ["cil"] build: [ ["dune" "subst"] {dev} diff --git a/packages/goblint-cil/goblint-cil.2.0.1/opam b/packages/goblint-cil/goblint-cil.2.0.1/opam index 8c7103d66319..7cddbdd07d33 100644 --- a/packages/goblint-cil/goblint-cil.2.0.1/opam +++ b/packages/goblint-cil/goblint-cil.2.0.1/opam @@ -42,6 +42,7 @@ depends: [ "conf-gcc" ] extra-files: ["realGccConfigure.patch" "md5=8cbe9cc88a05dc7b034b54930b31baed"] +patches: ["realGccConfigure.patch"] conflicts: ["cil"] build: [ ["dune" "subst"] {dev}