Commit ab96c224 authored by Kan-Ru Chen's avatar Kan-Ru Chen

Fix FTBFS on mips64el

parent ec51f14c
......@@ -8,15 +8,15 @@ Subject: MuPDF crossbuild use host cc for utils
2 files changed, 3 insertions(+)
diff --git a/Makefile b/Makefile
index dde1840..cb76e87 100644
index dde1840..e229d7e 100644
--- a/Makefile
+++ b/Makefile
@@ -134,6 +134,8 @@ PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o)
# --- Generated embedded font files ---
HEXDUMP_EXE := $(OUT)/scripts/hexdump.exe
+$(HEXDUMP_EXE): scripts/hexdump.c | $(ALL_DIR)
+ $(QUIET_CC) $(CC_FOR_BUILD) $(CFLAGS) -o $@ $<
+$(HEXDUMP_EXE): scripts/hexdump.c
+ $(QUIET_CC) $(MKTGTDIR) ; $(CC_FOR_BUILD) $(CFLAGS) -o $@ $<
FONT_BIN := $(sort $(wildcard resources/fonts/urw/*.cff))
FONT_BIN += $(sort $(wildcard resources/fonts/han/*.ttc))
......
From: Kan-Ru Chen <koster@debian.org>
Date: Sat, 3 Nov 2018 14:41:25 +0000
Subject: Allow disabling objcopy
---
Makerules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makerules b/Makerules
index 35c9cbe..54530cf 100644
--- a/Makerules
+++ b/Makerules
@@ -94,7 +94,7 @@ else ifeq ($(OS),MACOS)
RANLIB = xcrun ranlib
else ifeq ($(OS),Linux)
- HAVE_OBJCOPY := yes
+ HAVE_OBJCOPY ?= yes
ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes)
SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
......@@ -3,3 +3,4 @@
0003-use-debian-flavor-build-options.patch
0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch
0005-MuPDF-crossbuild-use-host-cc-for-utils.patch
0006-Allow-disabling-objcopy.patch
......@@ -29,6 +29,10 @@ BUILD_FLAGS += USE_SYSTEM_LIBS=yes
# Force using system lcms2 (was not included in default system library set)
BUILD_FLAGS += USE_SYSTEM_LCMS2=yes
ifeq ($(DEB_TARGET_ARCH),mips64el)
BUILD_FLAGS += HAVE_OBJCOPY=no
endif
override_dh_auto_build:
dh_auto_build -- $(BUILD_FLAGS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment