gdk-pixbuf: unbreak gdk-pixbuf loaders.cache
authorPierre CROKAERT <pct@crookies.net>
Sat, 20 Jan 2018 10:46:19 +0000 (11:46 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Sun, 4 Feb 2018 07:38:14 +0000 (08:38 +0100)
Fix gdk-pixbuf broken by host package moved to /lib instead of /usr/lib
Regression occured following commit 19ba17ee3ba946ac86 (Globally replace
$(HOST_DIR)/usr/lib with $(HOST_DIR)/lib).

The host package loader.cache now refer to $(HOST_DIR)/lib, and the target
one should refer to /usr/lib.

Fix it by adjusting the sed invocation.

[Peter: extend commit message]
Signed-off-by: Pierre CROKAERT <pct@crookies.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/gdk-pixbuf/gdk-pixbuf.mk

index e36761cb8de43eacf951760885dfd30d863b7732..33de2e3d3a92dc409e246ed569c0015963f9531d 100644 (file)
@@ -64,7 +64,7 @@ define GDK_PIXBUF_UPDATE_CACHE
        GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders \
                $(HOST_DIR)/bin/gdk-pixbuf-query-loaders \
                > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
-       $(SED) "s,$(HOST_DIR),,g" \
+       $(SED) "s,$(HOST_DIR)/lib,/usr/lib,g" \
                $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
 endef
 GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE