On Mon, Dec 21, 2015 at 12:28:25PM +0000, Dominic Hargreaves wrote:
> Control: tags -1 + patch
>
> On Sat, Apr 04, 2015 at 03:46:24PM +0200, Christian PERRIER wrote:
> > Quoting Dejan Latinovic (dejan.latino...@imgtec.com):
> > >
> > > Hello,
> > >
> > > I had noticed that the gui part builds with target "all"
> > > even if the main target is "out".
> > > Beside that, in gui/Makefile OCAMLC variable is redefined and ocamlc.opt
> > > is used instead of
> > > ocamlc (defined in Makefile.inc).
> > >
> > > The patch that contains needed changes is attached,
> > > With this patch I was able to successfully build geneweb for both mips
> > > and mipsel.
> > >
> > > Could you please include this patch?
> >
> > I'm working on this but I'm having big trouble building from git, I
> > don't know why:
> >
> > dpkg-source: info: using source format `3.0 (quilt)'
> > dpkg-source: info: building geneweb using existing
> > ./geneweb_6.08dfsg.orig.tar.xz
> > dpkg-source: warning: ignoring deletion of file tools/Makefile.inc.out
> > dpkg-source: info: local changes detected, the modified files are:
> > git/Makefile
> > git/dag2html/dag2html.1
> > git/gui/Makefile
> > git/hd/lang/lexicon.txt
> > git/man/gwc.1
> > git/setup/setup.ml
> > git/src/gwd.ml
> > git/tools/Makefile.inc.win
> > dpkg-source: error: aborting due to unexpected upstream changes, see
> > /tmp/geneweb_6.08dfsg-3.diff.eKkgeY
> > dpkg-source: info: you can integrate the local changes with dpkg-source
> > --commit
> > dpkg-buildpackage: error: dpkg-source -b git gave error exit status 2
> > gbp:error: Couldn't run 'git-pbuilder': git-pbuilder returned 2
> >
> > This even though there are NO local changes in the git repository. I
> > don't understand what's happening here....
> >
> > Anyone with a clue?
> >
> > The git repo URL: git://anonscm.debian.org/collab-maint/geneweb.git
>
> This is caused by the (presumably inadvertent) direct modification of
> tools/Makefile.inc.opt in 80393e8[1]. If I remove that file with the
> attached patch, dpkg-source works again.
>
> #808390 will cause geneweb to be removed from testing soon as part of
> the perl 5.22 transition, so it would be great to get this fixed.
>
> If you're short on time, let me know and I can see if I can assist
> with an NMU (speaking as a perl maintainer and not a geneweb user).
Here's the patch.
>From 56238a1412fff0b57f5ff81046f8d95fedf2212b Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <d...@earth.li>
Date: Mon, 21 Dec 2015 12:19:02 +0000
Subject: [PATCH] Remove stray generated file commited to git in 80393e8
---
tools/Makefile.inc.opt | 43 -------------------------------------------
1 file changed, 43 deletions(-)
delete mode 100644 tools/Makefile.inc.opt
diff --git a/tools/Makefile.inc.opt b/tools/Makefile.inc.opt
deleted file mode 100644
index 594c1f9..0000000
--- a/tools/Makefile.inc.opt
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: Makefile.inc.unix,v 1.6 2007/09/12 09:58:44 ddr Exp $
-
-TOP=..
-CAMLP5_COMM=TOP=$(TOP) $(TOP)/tools/camlp5_comm.sh
-CAMLP5F=-DUNIX
-CAMLP5D=+camlp5
-LIBUNIX=-cclib -lunix
-OCAMLC=ocamlc.opt
-OCAMLOPT=ocamlopt.opt
-OCAMLI=
-OCAMLD=
-STRIP=strip
-RM=/bin/rm -f
-EXE=
-STATIC=-ccopt -static
-STATIC=
-TEST_DIR=test $$(basename "$<") = "$<" || { echo "Please run 'make' in directory '$$(dirname "$<")' first"; exit 1; }
-
-all::
-opt::
-
-clean::
- $(RM) *.out *.opt *.cm[oixa] *.cmxa *.pp[oi] *.o *.a *.obj *.lib *.lck *.bak *~ .#* *.annot
-
-.SUFFIXES: .ml .cmo .mli .cmi .cmx
-
-.mli.cmi:
- @$(TEST_DIR)
- @$(CAMLP5_COMM) $(CAMLP5F) $< -o $*.ppi
- $(OCAMLC) $(OCAMLI) -I $(CAMLP5D) -c -intf $*.ppi
- $(RM) $*.ppi
-
-.ml.cmo:
- @$(TEST_DIR)
- @$(CAMLP5_COMM) $(CAMLP5F) $< -o $*.ppo
- $(OCAMLC) $(OCAMLI) $(OCAMLD) -I $(CAMLP5D) -c -impl $*.ppo
- $(RM) $*.ppo
-
-.ml.cmx:
- @$(TEST_DIR)
- @$(CAMLP5_COMM) $(CAMLP5F) $< -o $*.ppo
- $(OCAMLOPT) $(OCAMLI) -I $(CAMLP5D) -c -impl $*.ppo
- $(RM) $*.ppo
--
2.1.4
