On 2010/07/29 09:13, Landry Breuil wrote:
> http://rhaalovely.net/build-failures//hppa/2010-07-16/textproc/mupdf.log
Could you try this, please? The port is doing some slightly tricky
things with the assembler which work on most arch but not hppa, this
disables it just on hppa. You might run out of RAM after this instead
though.
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/mupdf/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 10 Jul 2010 14:02:08 -0000 1.17
+++ Makefile 31 Jul 2010 00:37:14 -0000
@@ -42,10 +42,15 @@ FAKE_FLAGS = prefix=${WRKINST}${PREFIX}
# the normal build embeds fonts into c files which take gobs of ram to
# compile (too much for some arch, even with -O0). fontres pulls them in
-# via the assember instead.
+# via the assember instead, but doesn't work on all arch.
+.if ! ${MACHINE_ARCH:Mhppa}
+PATCH_LIST = patch-* fontres-*
+.endif
+
pre-configure:
cp ${FILESDIR}/fontres.c ${WRKSRC}/mupdf/
${SUBST_CMD} ${WRKSRC}/debian/mupdf.pc
+ perl -pi -e 's,@ echo ([A-Z]+) \$$@ && ,,' ${WRKSRC}/Makefile
post-install:
${INSTALL_MAN} ${WRKSRC}/debian/mupdf.1 ${PREFIX}/man/man1
Index: patches/fontres-Makefile
===================================================================
RCS file: patches/fontres-Makefile
diff -N patches/fontres-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/fontres-Makefile 31 Jul 2010 00:37:14 -0000
@@ -0,0 +1,55 @@
+$OpenBSD: patch-Makefile,v 1.1 2010/06/03 19:38:34 sthen Exp $
+--- Makefile.orig Wed Jun 2 13:21:22 2010
++++ Makefile Sat Jul 31 01:28:33 2010
+@@ -36,6 +36,7 @@ endif
+ #
+
+ GENFILE_CMD = @ echo GENFILE $@ && $(firstword $^) $@ $(wordlist 2, 999, $^)
++AS_CMD = $(AS) -o $@ $<
+ CC_CMD = @ echo CC $@ && $(CC) -o $@ -c $< $(CFLAGS)
+ LD_CMD = @ echo LD $@ && $(LD) -o $@ $^ $(LDFLAGS) $(LIBS)
+ AR_CMD = @ echo AR $@ && $(AR) cru $@ $^
+@@ -57,6 +58,10 @@ FONTDUMP_EXE=$(OBJDIR)/fontdump
+ $(FONTDUMP_EXE): $(OBJDIR)/fontdump.o
+ $(LD_CMD)
+
++FONTRES_EXE=$(OBJDIR)/fontres
++$(FONTRES_EXE): $(OBJDIR)/fontres.o
++ $(LD_CMD)
++
+ CMAPDUMP_EXE=$(OBJDIR)/cmapdump
+ $(CMAPDUMP_EXE): $(OBJDIR)/cmapdump.o
+ $(LD_CMD)
+@@ -110,6 +115,8 @@ $(OBJDIR)/%.o: mupdf/%.c
+ $(CC_CMD)
+ $(OBJDIR)/%.o: $(GENDIR)/%.c
+ $(CC_CMD)
++$(OBJDIR)/%.o: $(GENDIR)/%.s
++ $(AS_CMD)
+
+ #
+ # Generated font file dumps
+@@ -129,18 +136,18 @@ CJKFONT_FILES=fonts/droid/DroidSansFallback.ttf
+
+ ifeq "$(pregen)" ""
+
+-$(GENDIR)/font_base14.c: $(FONTDUMP_EXE) $(BASEFONT_FILES)
++$(GENDIR)/font_base14.s: $(FONTRES_EXE) $(BASEFONT_FILES)
+ $(GENFILE_CMD)
+-$(GENDIR)/font_cjk.c: $(FONTDUMP_EXE) $(CJKFONT_FILES)
++$(GENDIR)/font_cjk.s: $(FONTRES_EXE) $(CJKFONT_FILES)
+ $(GENFILE_CMD)
+
+ endif
+
+ FONT_SRC=\
+- $(GENDIR)/font_base14.c \
+- $(GENDIR)/font_cjk.c
++ $(GENDIR)/font_base14.s \
++ $(GENDIR)/font_cjk.s
+
+-FONT_OBJ=$(FONT_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.o)
++FONT_OBJ=$(FONT_SRC:$(GENDIR)/%.s=$(OBJDIR)/%.o)
+
+ #
+ # Generated CMap file dumps
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 3 Jun 2010 19:38:34 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,63 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1 2010/06/03 19:38:34 sthen Exp $
---- Makefile.orig Wed Jun 2 13:21:22 2010
-+++ Makefile Thu Jun 3 11:46:32 2010
-@@ -35,10 +35,11 @@ endif
- # Build commands
- #
-
--GENFILE_CMD = @ echo GENFILE $@ && $(firstword $^) $@ $(wordlist 2, 999, $^)
--CC_CMD = @ echo CC $@ && $(CC) -o $@ -c $< $(CFLAGS)
--LD_CMD = @ echo LD $@ && $(LD) -o $@ $^ $(LDFLAGS) $(LIBS)
--AR_CMD = @ echo AR $@ && $(AR) cru $@ $^
-+GENFILE_CMD = $(firstword $^) $@ $(wordlist 2, 999, $^)
-+AS_CMD = $(AS) -o $@ $<
-+CC_CMD = $(CC) -o $@ -c $< $(CFLAGS)
-+LD_CMD = $(LD) -o $@ $^ $(LDFLAGS) $(LIBS)
-+AR_CMD = $(AR) cru $@ $^
-
- #
- # Directories
-@@ -57,6 +58,10 @@ FONTDUMP_EXE=$(OBJDIR)/fontdump
- $(FONTDUMP_EXE): $(OBJDIR)/fontdump.o
- $(LD_CMD)
-
-+FONTRES_EXE=$(OBJDIR)/fontres
-+$(FONTRES_EXE): $(OBJDIR)/fontres.o
-+ $(LD_CMD)
-+
- CMAPDUMP_EXE=$(OBJDIR)/cmapdump
- $(CMAPDUMP_EXE): $(OBJDIR)/cmapdump.o
- $(LD_CMD)
-@@ -110,6 +115,8 @@ $(OBJDIR)/%.o: mupdf/%.c
- $(CC_CMD)
- $(OBJDIR)/%.o: $(GENDIR)/%.c
- $(CC_CMD)
-+$(OBJDIR)/%.o: $(GENDIR)/%.s
-+ $(AS_CMD)
-
- #
- # Generated font file dumps
-@@ -129,18 +136,18 @@ CJKFONT_FILES=fonts/droid/DroidSansFallback.ttf
-
- ifeq "$(pregen)" ""
-
--$(GENDIR)/font_base14.c: $(FONTDUMP_EXE) $(BASEFONT_FILES)
-+$(GENDIR)/font_base14.s: $(FONTRES_EXE) $(BASEFONT_FILES)
- $(GENFILE_CMD)
--$(GENDIR)/font_cjk.c: $(FONTDUMP_EXE) $(CJKFONT_FILES)
-+$(GENDIR)/font_cjk.s: $(FONTRES_EXE) $(CJKFONT_FILES)
- $(GENFILE_CMD)
-
- endif
-
- FONT_SRC=\
-- $(GENDIR)/font_base14.c \
-- $(GENDIR)/font_cjk.c
-+ $(GENDIR)/font_base14.s \
-+ $(GENDIR)/font_cjk.s
-
--FONT_OBJ=$(FONT_SRC:$(GENDIR)/%.c=$(OBJDIR)/%.o)
-+FONT_OBJ=$(FONT_SRC:$(GENDIR)/%.s=$(OBJDIR)/%.o)
-
- #
- # Generated CMap file dumps
