Skip to contentSkip to conversation

gimp: Disable vector icons generation on mips/armv7a

PATCH In review Khem Raj 2 participants 3 messages Apr 10, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 gimp: Disable vector icons generation on mips/armv7a

Fixes errors like

make[3]: *** [Makefile:2395: 24/document-print.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gimp-center.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/media-optical.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gimp-channel-gray.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gimp-channel-blue.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gtk-select-color.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gimp-channel-alpha.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/media-floppy.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gimp-business-card.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gimp-channel.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/dialog-information.svg] Segmentation fault (core dumped)

Cc Andreas Müller <[email protected]>
---
 meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb | 3 +++
 1 file changed, 3 insertions(+)
meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb +3 -0
index 838bd374a1..5a58f48ec3 100644
@@ -45,6 +45,9 @@ EXTRA_OECONF = "--disable-python \
                 --without-webkit \
                 --without-wmf"
 
+EXTRA_OECONF_append_libc-musl_mipsarch = " --disable-vector-icons"
+EXTRA_OECONF_append_libc-musl_armv7a = " --disable-vector-icons"
+
 do_configure_append() {
     find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
     find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
Signature · 1 line
2.26.0
#1 lore raw
Quoted 26 lines · Khem Raj

Fixes errors like

make[3]: *** [Makefile:2395: 24/document-print.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gimp-center.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/media-optical.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gimp-channel-gray.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gimp-channel-blue.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gtk-select-color.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gimp-channel-alpha.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/media-floppy.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gimp-business-card.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gimp-channel.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/dialog-information.svg] Segmentation fault (core dumped)

Cc Andreas Müller <[email protected]>
---
 meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb | 3 +++
 1 file changed, 3 insertions(+)
meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb +0 -0
index 838bd374a1..5a58f48ec3 100644

meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb EXTRA_OECONF = "--disable-python \ · line 49

Quoted 5 lines
meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb +2 -0
@@ -45,6 +45,9 @@ EXTRA_OECONF = "--disable-python \
                 --without-webkit \
                 --without-wmf"
 
+EXTRA_OECONF_append_libc-musl_mipsarch = " --disable-vector-icons"
+EXTRA_OECONF_append_libc-musl_armv7a = " --disable-vector-icons"

Maybe you should mention musl in commit message?

Andreas

author
#2 lore raw
Quoted 31 lines · Andreas Müller
Quoted 29 lines · Khem Raj

Fixes errors like

make[3]: *** [Makefile:2395: 24/document-print.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gimp-center.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/media-optical.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gimp-channel-gray.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gimp-channel-blue.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gtk-select-color.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gimp-channel-alpha.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/media-floppy.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gimp-business-card.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/gimp-channel.svg] Segmentation fault (core dumped) make[3]: *** [Makefile:2395: 24/dialog-information.svg] Segmentation fault (core dumped)

Cc Andreas Müller <[email protected]>
---
 meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb | 3 +++
 1 file changed, 3 insertions(+)
meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb +0 -0
index 838bd374a1..5a58f48ec3 100644
@@ -45,6 +45,9 @@ EXTRA_OECONF = "--disable-python \
                 --without-webkit \
                 --without-wmf"
 
Quoted 4 lines

meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb EXTRA_OECONF = "--disable-python \ · line 49

Quoted 2 lines
meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb +2 -0
+EXTRA_OECONF_append_libc-musl_mipsarch = " --disable-vector-icons"
+EXTRA_OECONF_append_libc-musl_armv7a = " --disable-vector-icons"

Maybe you should mention musl in commit message?

yes, I edited the commit message to state that in master-next

Quoted 1 line

Andreas