tags 475981 + patch
thanks

Hi,

the flags in the Makefile of drqueue are a bit of a mess. The attached
patch fixes this and thus makes the package build again (with
gcc/g++-4.3). Build log at:

http://servercare.de/debian/logs/drqueue_i386_2008-04-23-1208904164.log


Regards,
  Sebastian

--- drqueue-0.60.0.orig/Makefile	2008-04-22 22:40:34.000000000 +0000
+++ drqueue-0.60.0/Makefile	2008-04-22 22:41:21.000000000 +0000
@@ -1,7 +1,7 @@
 # $Id: Makefile 1164 2005-02-11 14:53:47Z kraken $
 
 CC = gcc
-CPP = g++
+CXX = g++
 OBJS_LIBDRQUEUE = computer_info.o computer_status.o task.o logger.o communications.o \
 			computer.o request.o semaphores.o job.o drerrno.o database.o common.o \
 			mayasg.o mentalraysg.o blendersg.o bmrtsg.o pixiesg.o 3delightsg.o
@@ -34,27 +34,27 @@
 
 ifeq ($(systype),Linux)
  CFLAGS = -DCOMM_REPORT -Wall -I. -D__LINUX -g -O2
- CPPFLAGS = -D__CPLUSPLUS -DCOMM_REPORT -Wall -I. -D__LINUX -g -O2
+ CXXFLAGS = -D__CPLUSPLUS -DCOMM_REPORT -Wall -I. -D__LINUX -g -O2
  MAKE = make
 else 
  ifeq ($(systype),IRIX)
 	CFLAGS = -DCOMM_REPORT -Wall -I. -D__IRIX -g -O2
-	CPPFLAGS = -D__CPLUSPLUS -DCOMM_REPORT -Wall -I. -D__IRIX -g -O2
+	CXXFLAGS = -D__CPLUSPLUS -DCOMM_REPORT -Wall -I. -D__IRIX -g -O2
 	MAKE = /usr/freeware/bin/gmake
  else
 	ifeq ($(systype),Darwin)
 	 CFLAGS = -DCOMM_REPORT -Wall -I. -D__OSX -g -O2
-   CPPFLAGS = -D__CPLUSPLUS -DCOMM_REPORT -Wall -I. -D__OSX -g -O2
+   CXXFLAGS = -D__CPLUSPLUS -DCOMM_REPORT -Wall -I. -D__OSX -g -O2
 	 MAKE = make
 	else
 	 ifeq ($(systype),FreeBSD)
 	  CFLAGS = -DCOMM_REPORT -Wall -I. -D__FREEBSD -g -O2
-    CPPFLAGS = -D__CPLUSPLUS -DCOMM_REPORT -Wall -I. -D__FREEBSD -g -O2
+    CXXFLAGS = -D__CPLUSPLUS -DCOMM_REPORT -Wall -I. -D__FREEBSD -g -O2
 	  MAKE = gmake
 	 else
 	  ifeq ($(systype),CYGWIN_NT-5.1)
 	   CFLAGS = -DCOMM_REPORT -Wall -I. -D__CYGWIN -g -O2 
-     CPPFLAGS = -D__CPLUSPLUS -DCOMM_REPORT -Wall -I. -D__CYGWIN -g -O2
+     CXXFLAGS = -D__CPLUSPLUS -DCOMM_REPORT -Wall -I. -D__CYGWIN -g -O2
 	   MAKE = make
 	   UIFLAGS += -e _mainCRTStartup -mwindows contrib/windows/Resources/drqueue.res 
  	  else
@@ -256,7 +256,7 @@
 	$(CC) -c $(CFLAGS) -o $@ $<
 
 sendjob: sendjob.o libdrqueue.a
-	$(CPP) $(CPPDFLAGS) -o $@ sendjob.o libdrqueue.a $(LDFLAGS)
+	$(CXX) $(CXXFLAGS) -o $@ sendjob.o libdrqueue.a $(LDFLAGS)
 
 libdrqueue.h: computer_info.h computer_status.h task.h logger.h communications.h \
 			computer.h request.h semaphores.h job.h drerrno.h database.h common.h

Reply via email to