Source: guetzli Version: 1.0.1-1 Tags: patch upstream User: [email protected] Usertags: ftcbfs
guetzli fails to cross build from source, because it hard codes the build architecture pkg-config and thus fails locating libpng. I'm attaching a patch for your convenience. Helmut
--- guetzli-1.0.1.orig/guetzli.make +++ guetzli-1.0.1/guetzli.make @@ -10,6 +10,8 @@ .PHONY: clean prebuild prelink +PKG_CONFIG ?= pkg-config + ifeq ($(config),release) RESCOMP = windres TARGETDIR = bin/Release @@ -19,12 +21,12 @@ INCLUDES += -I. -Ithird_party/butteraugli FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -g `pkg-config --cflags libpng` - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -g -std=c++11 `pkg-config --cflags libpng` + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -g `$(PKG_CONFIG) --cflags libpng` + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -g -std=c++11 `$(PKG_CONFIG) --cflags libpng` ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) `pkg-config --libs libpng` + ALL_LDFLAGS += $(LDFLAGS) `$(PKG_CONFIG) --libs libpng` LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) define PREBUILDCMDS endef @@ -46,12 +48,12 @@ INCLUDES += -I. -Ithird_party/butteraugli FORCE_INCLUDE += ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g `pkg-config --cflags libpng` - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -std=c++11 `pkg-config --cflags libpng` + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g `$(PKG_CONFIG) --cflags libpng` + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -std=c++11 `$(PKG_CONFIG) --cflags libpng` ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) `pkg-config --libs libpng` + ALL_LDFLAGS += $(LDFLAGS) `$(PKG_CONFIG) --libs libpng` LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) define PREBUILDCMDS endef @@ -210,4 +212,4 @@ -include $(OBJECTS:%.o=%.d) ifneq (,$(PCH)) -include $(OBJDIR)/$(notdir $(PCH)).d -endif \ No newline at end of file +endif
