[Python-modules-commits] r3471 - in /packages/python-pyglew/trunk/debian: patches/01_fix_makefile.dpatch rules

[piotr at users.alioth.debian.org]

Author: piotr
Date: Sun Oct 28 22:16:35 2007
New Revision: 3471

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3471
Log:
use CXX instead of CC

Modified:
    packages/python-pyglew/trunk/debian/patches/01_fix_makefile.dpatch
    packages/python-pyglew/trunk/debian/rules

Modified: packages/python-pyglew/trunk/debian/patches/01_fix_makefile.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-pyglew/trunk/debian/patches/01_fix_makefile.dpatch?rev=3471&op=diff
==============================================================================
--- packages/python-pyglew/trunk/debian/patches/01_fix_makefile.dpatch (original)
+++ packages/python-pyglew/trunk/debian/patches/01_fix_makefile.dpatch Sun Oct 28 22:16:35 2007
@@ -6,9 +6,14 @@
 
 @DPATCH@
 diff -urNad python-pyglew-0.1.2~/Makefile python-pyglew-0.1.2/Makefile
---- python-pyglew-0.1.2~/Makefile	2007-10-28 19:04:32.000000000 +0100
-+++ python-pyglew-0.1.2/Makefile	2007-10-28 19:15:06.000000000 +0100
-@@ -5,22 +5,21 @@
+--- python-pyglew-0.1.2~/Makefile	2007-10-28 21:31:56.000000000 +0100
++++ python-pyglew-0.1.2/Makefile	2007-10-28 23:11:42.000000000 +0100
+@@ -1,26 +1,26 @@
+ builddir=build
++CXXFLAGS+=-fpic -Wall
+ 
+ GLBASE = $(subst extensions/,,$(wildcard extensions/GL_*))
+ GLOBJECTS = $(addprefix $(builddir)/, $(addsuffix -gen.o, $(GLBASE)))
  GLCCS = $(addprefix $(builddir)/, $(addsuffix -gen.cc, $(GLBASE)))
  GLHHS = $(addprefix include/, pack.hh unpack.hh unpack_ptr.hh pyglew_exception.hh pointer_wrapper.hh)
  
@@ -34,26 +39,26 @@
 -pyglew.$(SOEXT): pyglew.o $(GLOBJECTS)
 -	$(LINK) -o $@ $^ $(LIBS)
 +$(builddir)/pyglew.$(SOEXT): $(builddir)/pyglew.o $(GLOBJECTS)
-+	$(CC) -shared $(CFLAGS) -o $@ $^ -lGLEW -lGL -l$(PYTHON)
++	$(CXX) -shared $(CXXFLAGS) -o $@ $^ -lGLEW -lGL -l$(PYTHON)
  
  $(builddir)/pyglew-gen.hh: $(addprefix $(builddir)/, $(addsuffix -gen.hh, $(GLBASE)))
  	cat $^ > $@
-@@ -32,11 +31,11 @@
+@@ -32,11 +32,11 @@
  	rm -f $@ ; 
  	for file in $^; do echo "/* " $$file " */" >> $@; cat $$file >> $@; done;
  
 -pyglew.o: pyglew.cc $(GLHHS) $(builddir)/pyglew-gen.hh $(builddir)/pyglew-methods.cc $(builddir)/pyglew-constants.cc
 -	$(COMPILE) $(INCLUDES) -Iinclude -I$(builddir) -c $< -o $@
 +$(builddir)/pyglew.o: pyglew.cc $(GLHHS) $(builddir)/pyglew-gen.hh $(builddir)/pyglew-methods.cc $(builddir)/pyglew-constants.cc
-+	$(CC) -fpic $(CFLAGS) -I/usr/include/$(PYTHON) -Iinclude -I. -Iinclude -I$(builddir) -c $< -o $@
++	$(CXX) $(CXXFLAGS) -I/usr/include/$(PYTHON) -Iinclude -I. -Iinclude -I$(builddir) -c $< -o $@
  
  $(builddir)/%-gen.o: $(builddir)/%-gen.cc $(GLHHS)
 -	$(COMPILE) $(INCLUDES)  -c $< -o $@
-+	$(CC) -fpic $(CFLAGS) -I/usr/include/$(PYTHON) -Iinclude -I. -c $< -o $@
++	$(CXX) $(CXXFLAGS) -I/usr/include/$(PYTHON) -Iinclude -I. -c $< -o $@
  
  $(builddir)/%-gen.hh $(builddir)/%-gen.cc $(builddir)/%-constants.cc: extensions/% main.py src/*.cc
  	mkdir -p $(builddir)
-@@ -50,7 +49,7 @@
+@@ -50,7 +50,7 @@
  	$(CXX) $(CXXFLAGS) $^ -o $@ -lGLEW -lGL -lSDL
  
  clean:

Modified: packages/python-pyglew/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-pyglew/trunk/debian/rules?rev=3471&op=diff
==============================================================================
--- packages/python-pyglew/trunk/debian/rules (original)
+++ packages/python-pyglew/trunk/debian/rules Sun Oct 28 22:16:35 2007
@@ -7,9 +7,9 @@
 PYVERS=$(shell pyversions -vr)
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-  CFLAGS += -O0
+  CXXFLAGS += -O0
 else
-  CFLAGS += -O2
+  CXXFLAGS += -O2
 endif
 export CFLAGS
 
@@ -28,7 +28,7 @@
 	[ ! -d build ] || rm -rf build
 	mkdir -p debian/python-pyglew/usr/lib/python$*/site-packages/
 	
-	$(MAKE) PYTHON=python$* CC=g++
+	$(MAKE) PYTHON=python$*
 	dh_install build/pyglew.so /usr/lib/python$*/site-packages/
 	
 	# workaround to let think libpython<VER> is local, so that dh_shlibdebs does not generate