Control: severity -1 important
Control: tags -1 patch

This bug affects i386, kfreebsd-i386, mips, powerpc and sparc (as determined by the attached script).

Replacing the existing debian/patches/bug763818_fix_preprocessor_double_substitution with the attached should fix it, but I haven't tested this yet.
Index: pkg-osg/OpenSceneGraph/src/osgDB/FileUtils.cpp
===================================================================
--- pkg-osg.orig/OpenSceneGraph/src/osgDB/FileUtils.cpp
+++ pkg-osg/OpenSceneGraph/src/osgDB/FileUtils.cpp
@@ -502,7 +502,12 @@ std::string osgDB::findFileInDirectory(c
 
 static void appendInstallationLibraryFilePaths(osgDB::FilePathList& filepath)
 {
+#undef linux
+#undef i386
+#undef sparc
+#undef mips
+#undef powerpc
 #ifdef OSG_DEFAULT_LIBRARY_PATH
 
     // Append the install prefix path to the library search path if configured
     filepath.push_back(ADDQUOTES(OSG_DEFAULT_LIBRARY_PATH));

Attachment: osg_plugindir_check.sh
Description: application/shellscript

Reply via email to