tag 477353 patch thanks (Dropping -release, which isn't a discussion list. Dropping others, and putting there d-d-g instead.) Adeodato Simó <dato@net.com.org.es> (29/07/2008): > > For #477353, are you sure we're talking about openal, or is it > > openscenegraph? > > Yeah, I should've made that clear: osgal depends on both openal and > openscenegraph, hence it can't be rebuilt until libopenscenegraph-dev > is installable, which needs that bug fixed. For d-d-g readers, the discussion started in [1], continued in [2]. 1. http://lists.debian.org/debian-release/2008/07/msg00067.html 2. http://lists.debian.org/debian-release/2008/07/msg00216.html Something along the following lines should do the trick (untested though). Please any NMUer remove me from Uploaders, since I got added back after Luk's NMU. Mraw, KiBi.
diff --git a/debian/changelog b/debian/changelog
index 2e64ed3..c47a56b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+openscenegraph (2.4.0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * No longer try to detect (using /proc/cpuinfo when available) how many
+ CPUs are available, fixing the FTBFS (due to -j0) on various platforms
+ (Closes: #477353). The right way to do it is to support parallel=n in
+ DEB_BUILD_OPTIONS, see Debian Policy §4.9.1.
+ * Remove Cyril Brulebois from Uploaders on his request (Luk's NMU wasn't
+ acknowledged).
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 29 Jul 2008 04:34:38 +0200
+
openscenegraph (2.4.0-1) unstable; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index 6e27abd..dcce7cd 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
Maintainer: Loic Dachary (OuoU) <loic@debian.org>
Build-Depends: debhelper (>= 4.0.0), dpatch, cmake, g++ (>= 3.3.0), libungif4-dev | giflib-dev, libjpeg-dev, libtiff-dev, lib3ds-dev, libfreetype6-dev, libpng12-dev, libcoin40-dev, libjasper-dev, libgdal-dev, libx11-dev, libxmu-dev, libglut-dev, ccache, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev, doxygen, libxine-dev
Standards-Version: 3.7.2
-Uploaders: Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
Package: libopenthreads-dev
Section: devel
diff --git a/debian/rules b/debian/rules
index d7e7c69..d68405a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,9 +27,6 @@ endif
#ifeq (smp,$(findstring smp,$(DEB_BUILD_OPTIONS)))
# SMP = -j2
#endif
-SMP = -j$(shell if [ -f /proc/cpuinfo ]; \
- then echo `cat /proc/cpuinfo | grep 'processor' | wc -l`; \
- else echo 1; fi)
# shared library versions, option 1
# version=2.0.5
@@ -129,7 +126,7 @@ build-stamp: configure-stamp
-D CMAKE_CXX_COMPILER='${CCACHE}' \
-D BUILD_OSG_WRAPPERS:BOOL=$$COMPILE_INTROSPECTION \
-D BUILD_OSG_EXAMPLES:BOOL=ON ../../${OSG}
- cd build/osg ; ${MAKE} ${SMP} VERBOSE=1
+ cd build/osg ; ${MAKE} VERBOSE=1
touch build-stamp
clean: clean-patched unpatch
Attachment:
signature.asc
Description: Digital signature