diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-04-30 15:44:36 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-05-01 09:12:26 +0200 |
| commit | 240a6fa76541bd9f3c52ec4499c8ad4af6e0110d (patch) | |
| tree | e7aabb7f1a9952bcbbcdacc9dad04d6476d0ef50 /rules/gobject-introspection.make | |
| parent | 7286096f1c6d1fb64ebcf4e7e95ca457fac09fc7 (diff) | |
| download | ptxdist-240a6fa76541bd9f3c52ec4499c8ad4af6e0110d.tar.gz ptxdist-240a6fa76541bd9f3c52ec4499c8ad4af6e0110d.tar.xz | |
gobject-introspection: don't use rpath
It's only used for running in qemu and although the rpath is disabled, the
path remains in the target binary.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/gobject-introspection.make')
| -rw-r--r-- | rules/gobject-introspection.make | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/rules/gobject-introspection.make b/rules/gobject-introspection.make index ab7a76be4..1201b4d1f 100644 --- a/rules/gobject-introspection.make +++ b/rules/gobject-introspection.make @@ -42,23 +42,13 @@ GOBJECT_INTROSPECTION_CONF_OPT := \ --without-cairo # needed so g-ir-compiler runs in qemu -GOBJECT_INTROSPECTION_LDFLAGS := -Wl,-rpath,$(GOBJECT_INTROSPECTION_DIR)/.libs - -GOBJECT_INTROSPECTION_MAKE_ENV := \ - GI_CROSS_LAUNCHER="$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross" +GOBJECT_INTROSPECTION_MAKE_ENV = \ + GI_CROSS_LAUNCHER="$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross -E LD_LIBRARY_PATH='$(GOBJECT_INTROSPECTION_DIR)/.libs:$(QEMU_CROSS_LD_LIBRARY_PATH)'" # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- -$(STATEDIR)/gobject-introspection.install: - @$(call targetinfo) - @$(call world/install, GOBJECT_INTROSPECTION) -# # the rpath is only needed while building the package itself - @chrpath --delete $(GOBJECT_INTROSPECTION_PKGDIR)/usr/bin/g-ir-compiler - @chrpath --delete $(GOBJECT_INTROSPECTION_PKGDIR)/usr/lib/libgirepository-1.0.so - @$(call touch) - $(STATEDIR)/gobject-introspection.install.post: @$(call targetinfo) @$(call world/install.post, GOBJECT_INTROSPECTION) |