diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-04-21 10:38:38 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-04-21 10:39:21 +0200 |
| commit | 04778c4f78d62cdd63f8aa87de52f317b2c0fd03 (patch) | |
| tree | 50c45264c99958aba4172444f11e89eab7d37db4 /rules/host-gobject-introspection.make | |
| parent | 5b68053005aed6ffe70bd431d740b40a319231d3 (diff) | |
| download | ptxdist-04778c4f78d62cdd63f8aa87de52f317b2c0fd03.tar.gz ptxdist-04778c4f78d62cdd63f8aa87de52f317b2c0fd03.tar.xz | |
gobject-introspection: version bump 1.46.0 -> 1.48.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/host-gobject-introspection.make')
| -rw-r--r-- | rules/host-gobject-introspection.make | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/rules/host-gobject-introspection.make b/rules/host-gobject-introspection.make index bfb0a1177..db40ad99f 100644 --- a/rules/host-gobject-introspection.make +++ b/rules/host-gobject-introspection.make @@ -31,7 +31,6 @@ HOST_GOBJECT_INTROSPECTION_CONF_OPT := \ --disable-gtk-doc-html \ --disable-gtk-doc-pdf \ --disable-doctool \ - --disable-host-gi \ --without-cairo # ---------------------------------------------------------------------------- @@ -46,19 +45,28 @@ $(STATEDIR)/host-gobject-introspection.install.post: @echo 'export pkg_ldflags="$$(find $${pkg_dir} -name .libs -printf "-Wl,-rpath,%p ")$${pkg_ldflags}"' \ >> $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-scanner @echo 'export CC=$(CROSS_CC)' >> $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-scanner + @echo 'export GI_CROSS_LAUNCHER="$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross"' \ + >> $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-scanner + @echo 'PATH="$(PTXDIST_SYSROOT_CROSS)/bin/qemu:$$PATH"' \ + >> $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-scanner @echo 'exec "$(PTXDIST_SYSROOT_HOST)/bin/g-ir-scanner" \ - --use-binary-wrapper=$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross \ - --use-ldd-wrapper=$(PTXDIST_SYSROOT_CROSS)/bin/ldd-cross \ "$${@}"' >> $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-scanner @chmod +x $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-scanner - @echo -e '#!/bin/sh\n$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross $(SYSROOT)/usr/bin/g-ir-compiler --includedir $(SYSROOT)/usr/share/gir-1.0 "$${@}"' > $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-compiler + + @echo '#!/bin/sh' > $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-compiler + @echo '$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross \ + $(SYSROOT)/usr/bin/g-ir-compiler --includedir \ + $(SYSROOT)/usr/share/gir-1.0 "$${@}"' >> $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-compiler @chmod +x $(PTXDIST_SYSROOT_CROSS)/bin/g-ir-compiler + @sed -i 's;"/share";"$(PTXDIST_SYSROOT_HOST)/share";' \ "$(PTXDIST_SYSROOT_HOST)/bin/g-ir-scanner" \ "$(PTXDIST_SYSROOT_HOST)/bin/g-ir-annotation-tool" + @sed -i 's;'/lib';'$(PTXDIST_SYSROOT_HOST)/lib';' \ "$(PTXDIST_SYSROOT_HOST)/bin/g-ir-scanner" \ "$(PTXDIST_SYSROOT_HOST)/bin/g-ir-annotation-tool" + @$(call touch) # ---------------------------------------------------------------------------- |