--- debian/changelog | 10 ++++++++++ debian/rules | 5 +---- 2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog index 2e64ed3..16c7778 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +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. + + -- Cyril Brulebois <[EMAIL PROTECTED]> Tue, 29 Jul 2008 04:34:38 +0200 + openscenegraph (2.4.0-1) unstable; urgency=low * New upstream release 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 -- 1.5.6.2 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]