Skip to contentSkip to conversation

package/poppler: set g-ir-scanner/g-ir-compiler paths

PATCH Applied James Hilliard 3 participants 3 messages Jul 22, 2022 – Aug 14, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/poppler: set g-ir-scanner/g-ir-compiler paths

The g-ir-scanner/g-ir-compiler paths don't always get picked up properly by cmake.

Fixes:
[ 98%] Linking CXX shared library libpoppler-glib.so
[ 98%] Built target poppler-glib
[ 98%] Generating Poppler-0.18.gir
/bin/sh: 1: /home/buildroot/buildroot/output/per-package/poppler/host/aarch64-buildroot-linux-gnu/sysroot/home/buildroot/buildroot/output/per-package/poppler/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/pkgconfig/../../bin/g-ir-scanner: not found

---
 package/poppler/poppler.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
package/poppler/poppler.mk +4 -1
index 18c044a9f6..b54262e7c4 100644
@@ -44,7 +44,10 @@ endif
 
 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
 POPPLER_DEPENDENCIES += gobject-introspection
-POPPLER_CONF_OPTS += -DENABLE_GOBJECT_INTROSPECTION=ON
+POPPLER_CONF_OPTS += \
+	-DENABLE_GOBJECT_INTROSPECTION=ON \
+	-DINTROSPECTION_SCANNER=$(STAGING_DIR)/usr/bin/g-ir-scanner \
+	-DINTROSPECTION_COMPILER=$(STAGING_DIR)/usr/bin/g-ir-compiler
 else
 POPPLER_CONF_OPTS += -DENABLE_GOBJECT_INTROSPECTION=OFF
 endif
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 19 lines · James Hilliard

The g-ir-scanner/g-ir-compiler paths don't always get picked up properly by cmake.

Fixes:
[ 98%] Linking CXX shared library libpoppler-glib.so
[ 98%] Built target poppler-glib
[ 98%] Generating Poppler-0.18.gir
/bin/sh: 1: /home/buildroot/buildroot/output/per-package/poppler/host/aarch64-buildroot-linux-gnu/sysroot/home/buildroot/buildroot/output/per-package/poppler/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/pkgconfig/../../bin/g-ir-scanner: not found

---
  package/poppler/poppler.mk | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
package/poppler/poppler.mk +0 -0
index 18c044a9f6..b54262e7c4 100644

package/poppler/poppler.mk endif · line 50

Quoted 8 lines
package/poppler/poppler.mk +4 -1
@@ -44,7 +44,10 @@ endif
 
  ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
  POPPLER_DEPENDENCIES += gobject-introspection
-POPPLER_CONF_OPTS += -DENABLE_GOBJECT_INTROSPECTION=ON
+POPPLER_CONF_OPTS += \
+	-DENABLE_GOBJECT_INTROSPECTION=ON \
+	-DINTROSPECTION_SCANNER=$(STAGING_DIR)/usr/bin/g-ir-scanner \
+	-DINTROSPECTION_COMPILER=$(STAGING_DIR)/usr/bin/g-ir-compiler

For meson, we define those in the global cross-compilation.conf file. But I
guess we can't do that for cmake because there's no standard variable name for them.

Applied to master, thanks.

Regards,
Arnout

package/poppler/poppler.mk endif · line 53

Quoted 3 lines
package/poppler/poppler.mk +0 -0
  else
  POPPLER_CONF_OPTS += -DENABLE_GOBJECT_INTROSPECTION=OFF
  endif

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#2 lore raw
In reply to James Hilliard
Quoted 13 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"James" == James Hilliard <[email protected]> writes:

The g-ir-scanner/g-ir-compiler paths don't always get picked up properly by cmake.

Fixes:
[ 98%] Linking CXX shared library libpoppler-glib.so
[ 98%] Built target poppler-glib
[ 98%] Generating Poppler-0.18.gir
/bin/sh: 1:
/home/buildroot/buildroot/output/per-package/poppler/host/aarch64-buildroot-linux-gnu/sysroot/home/buildroot/buildroot/output/per-package/poppler/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib/pkgconfig/../../bin/g-ir-scanner:
not found

Quoted 1 line

Committed to 2022.05.x and 2022.02.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot