r46543 - /packages/cbp2make/trunk/debian/patches/Makefile.patch

[olebole-guest at users.alioth.debian.org]

Author: olebole-guest
Date: Tue Feb 18 13:53:36 2014
New Revision: 46543

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46543
Log:
Put tinyxml lib to libs instead of LDFLAGS to avoid FTBS on Ubuntu Saucy

Modified:
    packages/cbp2make/trunk/debian/patches/Makefile.patch

Modified: packages/cbp2make/trunk/debian/patches/Makefile.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/cbp2make/trunk/debian/patches/Makefile.patch?rev=46543&op=diff
==============================================================================
--- packages/cbp2make/trunk/debian/patches/Makefile.patch	(original)
+++ packages/cbp2make/trunk/debian/patches/Makefile.patch	Tue Feb 18 13:53:36 2014
@@ -1,8 +1,6 @@
-Index: cbp2make-147/cbp2make.cbp.mak.unix
-===================================================================
---- cbp2make-147.orig/cbp2make.cbp.mak.unix
-+++ cbp2make-147/cbp2make.cbp.mak.unix
-@@ -11,12 +11,13 @@
+--- a/cbp2make.cbp.mak.unix
++++ b/cbp2make.cbp.mak.unix
+@@ -11,12 +11,12 @@
  LD = g++
  WINDRES = windres
  
@@ -16,13 +14,12 @@
 +CFLAGS +=  -Wall -fexceptions -fno-strict-aliasing -Wno-write-strings
 +RESINC +=
 +LIBDIR +=
-+LIB +=
++LIB += -ltinyxml
 +LDFLAGS +=
-+LDFLAGS += -ltinyxml
  
  INC_DEBUG =  $(INC)
  CFLAGS_DEBUG =  $(CFLAGS) -g
-@@ -104,10 +105,6 @@
+@@ -104,10 +104,6 @@
  	$(OBJDIR_RELEASE)/lib/stlstrings.o \
  	$(OBJDIR_RELEASE)/lib/stlvariables.o \
  	$(OBJDIR_RELEASE)/lib/stringhash.o \
@@ -33,7 +30,7 @@
  	$(OBJDIR_RELEASE)/src/buildtools.o \
  	$(OBJDIR_RELEASE)/src/cbbuildcfg.o \
  	$(OBJDIR_RELEASE)/src/cbbuildmgr.o \
-@@ -603,5 +600,10 @@
+@@ -603,5 +599,10 @@
  	src/cbglobalvar.h \
  	src/cbhelper.h