[PATCH 0/8] Fix usage of glib-or-gtk-build-system

Using glib-or-gtk-build-system requires hard-coding the list of modules in

#:modules. Libreoffice and netsurf tried to use

%glib-or-gtk-build-system-modules instead, but that lead to crashes.

This series introduces new %glib-or-gtk-build-system-default-modules that

contains the list that should go into #:modules. Using it in libreoffice and

netsurf fixes the mentioned crashes. Other places were adjusted as well to

use it instead of copying over the list. That would be hard to keep in sync.

Tomas Volf (8):

build: glib-or-gtk: Export %glib-or-gtk-build-system-default-modules.

gnu: netsurf: Actually use glib-or-gtk-build-system.

gnu: libreoffice: Actually use glib-or-gtk-build-system.

gnu: sugar: Dehardcode #:modules.

gnu: sugar-datastore: Dehardcode #:modules.

gnu: sugar-toolkit-gtk3: Dehardcode #:modules.

gnu: nimf: Dehardcode #:modules.

gnu: hime: Dehardcode #:modules.

gnu/packages/language.scm | 12 ++++--------

gnu/packages/libreoffice.scm | 2 +-

gnu/packages/sugar.scm | 15 ++++++---------

gnu/packages/web.scm | 2 +-

guix/build-system/glib-or-gtk.scm | 9 +++++----

5 files changed, 17 insertions(+), 23 deletions(-)

base-commit: f24b14767d362a84e6469682b4fe303b50f4b589

--

2.41.0

The #:modules argument was based on %glib-or-gtk-build-system-modules, which,

despite the name, should go into #:imported-modules. When put into #:modules,

it leads to following warning:

WARNING: (guile-user): `%standard-phases' imported from both (guix build glib-or-gtk-build-system) and (guix build gnu-build-system)

Due to the definition of %glib-or-gtk-build-system-modules

`((guix build glib-or-gtk-build-system)

,@%gnu-build-system-modules)

It results in %standard-phases from gnu-build-system being used, effectively

turning glib-or-gtk-build-system with #:modules set to

%glib-or-gtk-build-system-modules into gnu-build-system.

The solution is to use the (now) exported default value of

#:modules (%glib-or-gtk-build-system-default-modules) as a base of the

#:modules.

%glib-or-gtk-build-system-default-modules instead of

%glib-or-gtk-build-system-modules.

Change-Id: Iacc4df7e213dbdae5a783e3aedde7e6e20402025

---

gnu/packages/web.scm | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

The list of modules used by default was not public, so users of this build

system had to pick between copy&pasting the list, or using

%glib-or-gtk-build-system-modules. The former is sub-optimal, since it is

hard to keep it in sync. The latter is just wrong and leads to basically

fall-backing to gnu-build-system.

The solution is to export the default list giving the users option to use it

directly.

(%glib-or-gtk-build-system-default-modules): Renamed from %default-modules.

(define-module): Export it.

(glib-or-gtk-build), (glib-or-gtk-cross-build): Use it.

Change-Id: I331b2a3f0bdc3ce14eb9f2f80605e7873369168d

---

guix/build-system/glib-or-gtk.scm | 9 +++++----

1 file changed, 5 insertions(+), 4 deletions(-)

list with %glib-or-gtk-build-system-default-modules.

Change-Id: I5a98d356c3e1a32b71e7949e3425da74081c1e82

---

gnu/packages/sugar.scm | 5 ++---

1 file changed, 2 insertions(+), 3 deletions(-)

hardcoded list with %glib-or-gtk-build-system-default-modules.

Change-Id: I9ceadd163d3f6cd49ed2623b6060b223257e9aed

---

gnu/packages/sugar.scm | 5 ++---

1 file changed, 2 insertions(+), 3 deletions(-)

the hardcoded list with %glib-or-gtk-build-system-default-modules.

Change-Id: I6a5e4511d2e696a673f7d5b49f75285ee488223d

---

gnu/packages/sugar.scm | 5 ++---

1 file changed, 2 insertions(+), 3 deletions(-)

The #:modules argument was based on %glib-or-gtk-build-system-modules, which,

despite the name, should go into #:imported-modules. When put into #:modules,

it leads to following warning:

WARNING: (guile-user): `%standard-phases' imported from both (guix build glib-or-gtk-build-system) and (guix build gnu-build-system)

Due to the definition of %glib-or-gtk-build-system-modules

`((guix build glib-or-gtk-build-system)

,@%gnu-build-system-modules)

It results in %standard-phases from gnu-build-system being used, effectively

turning glib-or-gtk-build-system with #:modules set to

%glib-or-gtk-build-system-modules into gnu-build-system.

The solution is to use the (now) exported default value of

#:modules (%glib-or-gtk-build-system-default-modules) as a base of the

#:modules.

%glib-or-gtk-build-system-default-modules instead of

%glib-or-gtk-build-system-modules.

Change-Id: I5304d9993af7d5f1187c6276e72a269aa60f5666

---

gnu/packages/libreoffice.scm | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

hardcoded list with %glib-or-gtk-build-system-default-modules.

Change-Id: I5360c0000173b293e9e24290a2e8eaed84e05750

---

gnu/packages/language.scm | 6 ++----

1 file changed, 2 insertions(+), 4 deletions(-)

hardcoded list with %glib-or-gtk-build-system-default-modules.

Change-Id: I5eaaac4cdd50b635d24b10c7fa2d365dcf392498

---

gnu/packages/language.scm | 6 ++----

1 file changed, 2 insertions(+), 4 deletions(-)