Bug#754662: witty 3.3.3+dfsg-2 upload still has build problems

2014-08-21 Thread peter green

Pau Garcia i Quiles wrote:




On Wed, Aug 20, 2014 at 3:15 AM, peter green plugw...@p10link.net 
mailto:plugw...@p10link.net wrote:


peter green wrote:


On the debian armel and mipsel porterboxes I got successful
paralell builds.

I must be getting tierd, the armel build succeeded but the mipsel
one is still ongoing.


Did mipsel finish successfully?

The mipsel test has now finished successfully.


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#754662: witty 3.3.3+dfsg-2 upload still has build problems

2014-08-20 Thread Pau Garcia i Quiles
On Wed, Aug 20, 2014 at 3:15 AM, peter green plugw...@p10link.net wrote:

 peter green wrote:


 On the debian armel and mipsel porterboxes I got successful paralell
 builds.

 I must be getting tierd, the armel build succeeded but the mipsel one is
 still ongoing.


Did mipsel finish successfully?

-- 
Pau Garcia i Quiles
http://www.elpauer.org
(Due to my workload, I may need 10 days to answer)


Bug#754662: witty 3.3.3+dfsg-2 upload still has build problems

2014-08-19 Thread Pau Garcia i Quiles
On Tue, Aug 19, 2014 at 6:57 AM, peter green plugw...@p10link.net wrote:



 I have uploaded a new version to mentors:

 http://mentors.debian.net/debian/pool/main/w/witty/witty_3.3.3+dfsg-3.dsc

 It has all your fixes (thanks again!) minus the leave parallelization
 out stuff. Instead, I have tried to fix parallelization.



  The dsc I just downloaded from there does not appear to have any attempt
 to fix paralellism. Just my changes plus a cosmetic fix to one of the
 patches.


Right, my mistake. I had uploaded an incomplete version. Please try now. I
have changed debian/rules to add build-resources, which is the troublesome
part, to the pre-requisites of both the static and the shared build.

Thank you again

-- 
Pau Garcia i Quiles
http://www.elpauer.org
(Due to my workload, I may need 10 days to answer)


Bug#754662: witty 3.3.3+dfsg-2 upload still has build problems

2014-08-19 Thread peter green

Pau Garcia i Quiles wrote:


Right, my mistake. I had uploaded an incomplete version. Please try 
now. I have changed debian/rules to add build-resources, which is the 
troublesome part, to the pre-requisites of both the static and the 
shared build.
Still doesn't look right, the target dependencies have been changed in 
debian/rules but paralell builds are still disabled and the changelog 
hasn't been updated.


I took the liberty of fixing these issues myself so I could test. A 
debdiff of what i'm testing with is attatched. Test results will follow


You appear to be a DM, can you upload witty yourself or will you be 
needing sponsorship?
diff -u witty-3.3.3+dfsg/debian/changelog witty-3.3.3+dfsg/debian/changelog
--- witty-3.3.3+dfsg/debian/changelog
+++ witty-3.3.3+dfsg/debian/changelog
@@ -1,3 +1,19 @@
+witty (3.3.3+dfsg-3) unstable; urgency=medium
+
+  [Peter Michael Green]
+  * Fix minifier detection logic in debian/rules. Closes: #754662
+  * Change dependencies in debian/rules to use list of architectures where
+nodejs is available rathe than incomplete list of architectures where
+it is available.
+
+  [Pau Garcia i Quiles]
+  * Fix patch 12_install_wtconfig (wrong endif condition, although did no
+harm)
+  * Fix target dependencies in debian/rules to (hopefully) make paralell
+builds reliable.
+
+ -- Pau Garcia i Quiles pgqui...@elpauer.org  Sat, 16 Aug 2014 18:18:42 +0200
+
 witty (3.3.3+dfsg-2) unstable; urgency=medium
 
   * Use yui-compressor where uglifyjs is not available. Closes: #754662
diff -u witty-3.3.3+dfsg/debian/control witty-3.3.3+dfsg/debian/control
--- witty-3.3.3+dfsg/debian/control
+++ witty-3.3.3+dfsg/debian/control
@@ -11,8 +11,9 @@
  mtasc, libgraphicsmagick1-dev, lsb-release, hardening-wrapper, libjs-jquery,
  libpango1.0-dev, python-pygments, firebird2.5-dev, libjs-jquery-jplayer, 
  jquery-jplayer-bluemonday, libmysqlclient-dev, fonts-font-awesome,
- libglew-dev (= 1.10), libqt4-dev, yui-compressor [mips powerpc s390x],
- node-uglify [!mips !powerpc !s390x]
+ libglew-dev (= 1.10), libqt4-dev, 
+ yui-compressor [!amd64 !armel !armhf !i386 !kfreebsd-amd64 !kfreebsd-i386 
!mipsel],
+ node-uglify [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mipsel]
 Standards-Version: 3.9.5.0
 Section: libdevel
 Homepage: http://www.webtoolkit.eu/
diff -u witty-3.3.3+dfsg/debian/patches/12_install_wtconfig.dpatch 
witty-3.3.3+dfsg/debian/patches/12_install_wtconfig.dpatch
--- witty-3.3.3+dfsg/debian/patches/12_install_wtconfig.dpatch
+++ witty-3.3.3+dfsg/debian/patches/12_install_wtconfig.dpatch
@@ -30,7 +30,7 @@
 +IF(FORCE_INSTALL_WTCONFIG OR NOT EXISTS ${DESTDIR}${CONFIGDIR}/wt_config.xml)
INSTALL(FILES ${WT_BINARY_DIR}/wt_config.xml DESTINATION ${CONFIGDIR})
 -ENDIF (NOT EXISTS ${CONFIGDIR}/wt_config.xml)
-+ENDIF(FORCE_INSTALL_WTCONFIG NOT EXISTS ${DESTDIR}${CONFIGDIR}/wt_config.xml)
++ENDIF(FORCE_INSTALL_WTCONFIG OR NOT EXISTS 
${DESTDIR}${CONFIGDIR}/wt_config.xml)
  
  IF(ENABLE_HARU AND HARU_FOUND)
SET(HAVE_HARU ON)
diff -u witty-3.3.3+dfsg/debian/rules witty-3.3.3+dfsg/debian/rules
--- witty-3.3.3+dfsg/debian/rules
+++ witty-3.3.3+dfsg/debian/rules
@@ -48,7 +48,7 @@
 # yui-compressor (what upstream used in the past) where there is no UglifyJS
 
 MINIFIER=$(shell which uglifyjs)
-ifdef MINIFIER
+ifneq ($(MINIFIER),)
   MINIFIER_FLAGS=-c --no-seqs -nc
 else
   MINIFIER=/usr/bin/yui-compressor
@@ -73,7 +73,7 @@
 
 CMAKEVERSION:=$(shell cmake --version | grep -o -P \(\\d\\.\\d\) | tr -d '\n')
 
-build-static/Makefile: patch-stamp
+build-static/Makefile: build-resources patch-stamp
dh_testdir
mkdir -p build-static
cd build-static  cmake .. -DCMAKE_INSTALL_PREFIX:PATH=/usr \
@@ -103,7 +103,7 @@
-DWEBUSER:STRING=www-data \
-DWEBGROUP:STRING=www-data
 
-build-shared/Makefile: patch-stamp
+build-shared/Makefile: build-resources patch-stamp
mkdir -p build-shared
cd build-shared  cmake .. -DCMAKE_INSTALL_PREFIX:PATH=/usr \
 -DCMAKE_C_FLAGS=$(CFLAGS) 
-DCMAKE_CXX_FLAGS=$(CXXFLAGS) \
@@ -140,7 +140,7 @@
 
 build-indep: build
 
-build-stamp: build-resources build-static/Makefile build-shared/Makefile
+build-stamp: build-static/Makefile build-shared/Makefile
dh_testdir
cd build-static  $(MAKE) $(MAKEFLAGS)
cd build-shared  $(MAKE) $(MAKEFLAGS)  $(MAKE) $(MAKEFLAGS) doc


Bug#754662: witty 3.3.3+dfsg-2 upload still has build problems

2014-08-19 Thread Pau Garcia i Quiles
On Tue, Aug 19, 2014 at 9:46 PM, peter green plugw...@p10link.net wrote:

Pau Garcia i Quiles wrote:


 Right, my mistake. I had uploaded an incomplete version. Please try now.
 I have changed debian/rules to add build-resources, which is the
 troublesome part, to the pre-requisites of both the static and the shared
 build.

  Still doesn't look right, the target dependencies have been changed in
 debian/rules but paralell builds are still disabled and the changelog
 hasn't been updated.


Ugh. I did that really quick this morning, maybe I took it still from a
work-in-progress directory :-/



 I took the liberty of fixing these issues myself so I could test. A
 debdiff of what i'm testing with is attatched. Test results will follow



Thank you!



 You appear to be a DM, can you upload witty yourself or will you be
 needing sponsorship?


I should be able to upload it myself

I will be applying for DD as soon as I get witty 3.3.3+dfsg-3 and ace
6.2.7+dfsg-1 in, which should be this very week


-- 
Pau Garcia i Quiles
http://www.elpauer.org
(Due to my workload, I may need 10 days to answer)


Bug#754662: witty 3.3.3+dfsg-2 upload still has build problems

2014-08-19 Thread peter green

Pau Garcia i Quiles wrote:


I took the liberty of fixing these issues myself so I could test.
A debdiff of what i'm testing with is attatched. Test results will
follow
 



Thank you!
On an armel chroot on my personal armv7 box I got random segfaults but 
i've been having various problems with that machine anyway, so I suspect 
it's more than likely a local problem. Not anything to do with your package.


On the debian armel and mipsel porterboxes I got successful paralell builds.

I think it's now time to go ahead with an upload to debian and see what 
the buildds make of it.



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#754662: witty 3.3.3+dfsg-2 upload still has build problems

2014-08-19 Thread peter green

peter green wrote:


On the debian armel and mipsel porterboxes I got successful paralell 
builds.
I must be getting tierd, the armel build succeeded but the mipsel one is 
still ongoing.



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#754662: witty 3.3.3+dfsg-2 upload still has build problems

2014-08-18 Thread Pau Garcia i Quiles
Peter,

I have uploaded a new version to mentors:

http://mentors.debian.net/debian/pool/main/w/witty/witty_3.3.3+dfsg-3.dsc

It has all your fixes (thanks again!) minus the leave parallelization out
stuff. Instead, I have tried to fix parallelization. Problem is I do not
have access to a porter box and qemubuilder is failing to install mipsel
(something with a systemd package missing). If you could try 3.3.3+dfsg-3
and tell me if parallel builds work, that would be great.




On Sat, Aug 16, 2014 at 3:51 PM, peter green plugw...@p10link.net wrote:

 Found 754662 3.3.3+dfsg-2
 Thanks

 The -2 upload made the build-depends satisfiable on all of the current
 release architectures However there still build problems that need to be
 addessed.

 Firstly there have been build-failures on many architectures in the
 official archive including a couple that built -1 successfully.

 The armel failure looks like it was caused by the introduction of paralell
 builds combined with with inadequate dependencies in the build system
 leading to race conditions. In particular we see a symlink is created after
 it is needed.

 CMake Error in src/CMakeLists.txt:
  Cannot find source file:

/«BUILDDIR»/witty-3.3.3+dfsg/src/web/skeleton/jquery.min.js

  Tried extensions .c .C .c++ .cc .cpp .cxx .m .M .mm .h .hh .h++ .hm .hpp
  .hxx .in .txx
 --snip--
 make: *** [build-static/Makefile] Error 1
 make: *** Waiting for unfinished jobs
 --snip--
 ln -s /usr/share/javascript/jquery/jquery.min.js src/web/skeleton/

 The kfreebsd-i386 failure seems to be a hang in documentation generation,
 I would guess this was just a random failure.

 mipsel looks like the same issue as armel.

 powerpc and s390x failed with

 (cd src/js; for I in *.js; do  -c --no-seqs -nc $I  `basename $I
 .js`.min.js; done)
 /bin/sh: 1: -c: not found

 Some investigation showed that the block of code in debian/rules to select
 the minifier is broken. In particular ifdef only tests if a variable is
 defined, not if it's value is non-empty.

 mips hasn't attempted a build yet.

 Secondly the packages build-depends are still unsatisfiable on all the
 debian-ports.org architectures (alpha, arm64, hppa, m68k, powerpcspe,
 ppc64, sh4 sparc64 and x32) and one architecture that has lost it's release
 status but is still in the offiical archive at present (sparc)

 Given that nodejs is only available on a relatively small number of
 architectures it probablly makes more sense to use a list of architectures
 where it is available than a list of architectures where it is not
 available.

 The attatched debdiff changes the lists of architectures in debian/control
 to specify a list of architectures where nodejs is known to be available
 rather than an incomplete list of architectures where it is not available,
 Fixes the minifier selection code in debian/rules and disables paralell
 builds. It has been build-tested on powerpc.

 I do not have any immediate intent to NMU.

 P.S. a little note on the version number in the debdiff. I was inititally
 testing in an arm64 qemu chroot but ran into the issue that qemu-aarch64
 and openjdk don't get along (real arm64 hardware is fine afaict) so I moved
 to testing on the powerpc porterbox.





-- 
Pau Garcia i Quiles
http://www.elpauer.org
(Due to my workload, I may need 10 days to answer)


Bug#754662: witty 3.3.3+dfsg-2 upload still has build problems

2014-08-18 Thread peter green

Pau Garcia i Quiles wrote:

Peter,

I have uploaded a new version to mentors:

http://mentors.debian.net/debian/pool/main/w/witty/witty_3.3.3+dfsg-3.dsc

It has all your fixes (thanks again!) minus the leave parallelization 
out stuff. Instead, I have tried to fix parallelization.
The dsc I just downloaded from there does not appear to have any attempt 
to fix paralellism. Just my changes plus a cosmetic fix to one of the 
patches.


Problem is I do not have access to a porter box and qemubuilder is 
failing to install mipsel (something with a systemd package missing). 
If you could try 3.3.3+dfsg-3 and tell me if parallel builds work, 
that would be great.
The trouble with paralell builds is that a successful build on one 
system does not imply a successful build on another of the same arch or 
even a successful build another time on the same system. I'm happy to 
test in my armel chroot and/or on the porterboxes but that's no 
gaurantee it will work on the autobuilders.



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#754662: witty 3.3.3+dfsg-2 upload still has build problems

2014-08-16 Thread peter green

Found 754662 3.3.3+dfsg-2
Thanks

The -2 upload made the build-depends satisfiable on all of the current 
release architectures However there still build problems that need to be 
addessed.


Firstly there have been build-failures on many architectures in the 
official archive including a couple that built -1 successfully.


The armel failure looks like it was caused by the introduction of 
paralell builds combined with with inadequate dependencies in the build 
system leading to race conditions. In particular we see a symlink is 
created after it is needed.


CMake Error in src/CMakeLists.txt:
 Cannot find source file:

   /«BUILDDIR»/witty-3.3.3+dfsg/src/web/skeleton/jquery.min.js

 Tried extensions .c .C .c++ .cc .cpp .cxx .m .M .mm .h .hh .h++ .hm .hpp
 .hxx .in .txx
--snip--
make: *** [build-static/Makefile] Error 1
make: *** Waiting for unfinished jobs
--snip--
ln -s /usr/share/javascript/jquery/jquery.min.js src/web/skeleton/

The kfreebsd-i386 failure seems to be a hang in documentation 
generation, I would guess this was just a random failure.


mipsel looks like the same issue as armel.

powerpc and s390x failed with

(cd src/js; for I in *.js; do  -c --no-seqs -nc $I  `basename $I .js`.min.js; 
done)
/bin/sh: 1: -c: not found

Some investigation showed that the block of code in debian/rules to 
select the minifier is broken. In particular ifdef only tests if a 
variable is defined, not if it's value is non-empty.


mips hasn't attempted a build yet.

Secondly the packages build-depends are still unsatisfiable on all the 
debian-ports.org architectures (alpha, arm64, hppa, m68k, powerpcspe, 
ppc64, sh4 sparc64 and x32) and one architecture that has lost it's 
release status but is still in the offiical archive at present (sparc)


Given that nodejs is only available on a relatively small number of 
architectures it probablly makes more sense to use a list of 
architectures where it is available than a list of architectures where 
it is not available.


The attatched debdiff changes the lists of architectures in 
debian/control to specify a list of architectures where nodejs is known 
to be available rather than an incomplete list of architectures where it 
is not available, Fixes the minifier selection code in debian/rules and 
disables paralell builds. It has been build-tested on powerpc.


I do not have any immediate intent to NMU.

P.S. a little note on the version number in the debdiff. I was 
inititally testing in an arm64 qemu chroot but ran into the issue that 
qemu-aarch64 and openjdk don't get along (real arm64 hardware is fine 
afaict) so I moved to testing on the powerpc porterbox.



diff -u witty-3.3.3+dfsg/debian/changelog witty-3.3.3+dfsg/debian/changelog
--- witty-3.3.3+dfsg/debian/changelog
+++ witty-3.3.3+dfsg/debian/changelog
@@ -1,3 +1,14 @@
+witty (3.3.3+dfsg-2+arm64) unreleased; urgency=medium
+
+  * Fix minifier detection logic in debian/rules Closes: #754662
+  * Disable paralell builds again. They don't seem to work reliablly.
+Reopens: 739436
+  * Change dependencies in debian/rules to use list of architectures where
+nodejs is available rathe than incomplete list of architectures where
+it is available.
+
+ -- Peter Michael Green plugw...@debian.org  Sat, 16 Aug 2014 05:05:31 +
+
 witty (3.3.3+dfsg-2) unstable; urgency=medium
 
   * Use yui-compressor where uglifyjs is not available. Closes: #754662
diff -u witty-3.3.3+dfsg/debian/control witty-3.3.3+dfsg/debian/control
--- witty-3.3.3+dfsg/debian/control
+++ witty-3.3.3+dfsg/debian/control
@@ -11,8 +11,9 @@
  mtasc, libgraphicsmagick1-dev, lsb-release, hardening-wrapper, libjs-jquery,
  libpango1.0-dev, python-pygments, firebird2.5-dev, libjs-jquery-jplayer, 
  jquery-jplayer-bluemonday, libmysqlclient-dev, fonts-font-awesome,
- libglew-dev (= 1.10), libqt4-dev, yui-compressor [mips powerpc s390x],
- node-uglify [!mips !powerpc !s390x]
+ libglew-dev (= 1.10), libqt4-dev, 
+ yui-compressor [!amd64 !armel !armhf !i386 !kfreebsd-amd64 !kfreebsd-i386 
!mipsel],
+ node-uglify [amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mipsel]
 Standards-Version: 3.9.5.0
 Section: libdevel
 Homepage: http://www.webtoolkit.eu/
diff -u witty-3.3.3+dfsg/debian/rules witty-3.3.3+dfsg/debian/rules
--- witty-3.3.3+dfsg/debian/rules
+++ witty-3.3.3+dfsg/debian/rules
@@ -48,7 +48,7 @@
 # yui-compressor (what upstream used in the past) where there is no UglifyJS
 
 MINIFIER=$(shell which uglifyjs)
-ifdef MINIFIER
+ifneq ($(MINIFIER),)
   MINIFIER_FLAGS=-c --no-seqs -nc
 else
   MINIFIER=/usr/bin/yui-compressor
@@ -65,10 +65,12 @@
   CFLAGS += -O2
 endif
 
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-  NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-  MAKEFLAGS += -j$(NUMJOBS)
-endif
+# Paralell build failed on armel and mipsel, presumablly due to inadequate
+# target dependencies. Disable it for now.
+#ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+#  NUMJOBS = $(patsubst