Skip to contentSkip to conversation

Fix gdk-pixbuf broken by host package moved to /lib instead of /usr/lib Regression occured following commit 19ba17ee3ba946ac865849df89d7c2988ea5aca9: "Globally replace $(HOST_DIR)/usr/lib with $(HOST_DIR)/lib" The host package loader.cache now references shared objects in /lib but target files are still in /usr/lib so sed has to be fixed accordingly.

PATCH New Pierre CROKAERT 2 participants 2 messages Jan 20, 2018 – Feb 4, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix gdk-pixbuf broken by host package moved to /lib instead of /usr/lib Regression occured following commit 19ba17ee3ba946ac865849df89d7c2988ea5aca9: "Globally replace $(HOST_DIR)/usr/lib with $(HOST_DIR)/lib" The host package loader.cache now references shared objects in /lib but target files are still in /usr/lib so sed has to be fixed accordingly.

---
 package/gdk-pixbuf/gdk-pixbuf.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/gdk-pixbuf/gdk-pixbuf.mk +1 -1
index e36761c..33de2e3 100644
@@ -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
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 Fix gdk-pixbuf broken by host package moved to /lib instead of /usr/lib Regression occured following commit 19ba17ee3ba946ac865849df89d7c2988ea5aca9: "Globally replace $(HOST_DIR)/usr/lib with $(HOST_DIR)/lib" The host package loader.cache now references shared objects in /lib but target files are still in /usr/lib so sed has to be fixed accordingly.

Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Pierre" == Pierre CROKAERT <[email protected]> writes:

Committed after extending / cleaning up the commit message, thanks.

Signature · 1 line
Bye, Peter Korsgaard