Package: pegasus-wms
Version: 4.0.1+dfsg-6
Severity: serious
Tags: patch

pegasus-wms FTBFS with the new subversion

[exec] g++ -ffor-scope -Wall -O2 -m64 -ggdb -DMACHINE_SPECIFIC=linux -DLINUX -DMAJOR=2 -DHAS_SVNVERSION=\"Unversioned directory\" pegasus-keg.cc -c -o pegasus-keg.o
    [exec] g++-4.7.real: error: directory": No such file or directory

This bug does not currently affect wheezy but jcristu has said that the new subversion may be allowed in and that therefore we should assume issues caused by it are rc for wheezy.

The cause is that the new version of subversion returns "Unversioned directory" in response to svnversion . in a non-svn directory, this breaks the build proces due to an inability to handle spaces in this field, the attached patch fixes this by not defining -DHAS_SVNVERSION if svnversion . reutrns "Unversioned directory".

Patch is attatched just add it to the quilt series.
Description: fix build with new subversion
 Recent versions of subversion return "Unversioned directory" in response
 to svnversion . in a non-svn  directory, this breaks the build process
 due to an inability to handle spaces in this field, the attached patch
 fixes this by not defining -DHAS_SVNVERSION if svnversion . reutrns
 "Unversioned directory"
Author: Peter Michael Green <plugw...@p10link.net>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- pegasus-wms-4.0.1+dfsg.orig/src/tools/pegasus-keg/Makefile
+++ pegasus-wms-4.0.1+dfsg/src/tools/pegasus-keg/Makefile
@@ -129,8 +129,10 @@ CONDOR_CXX = $(CONDOR) $(CXX)
 
 SVNVERSION = $(shell svnversion . 2>> /dev/null)
 ifneq (,${SVNVERSION})
+ifneq (Unversioned directory,${SVNVERSION})
 CXXFLAGS += -DHAS_SVNVERSION=\"${SVNVERSION}\"
 endif
+endif
 
 # add large file support
 ifneq (,${LFS_CFLAGS})

Reply via email to