Author: rmh Date: 2004-07-28 16:26:07 -0500 (Wed, 28 Jul 2004) New Revision: 1693
Modified: trunk/debian/CHANGESETS trunk/debian/changelog trunk/debian/patches/031_glxinfo_makefile.diff Log: - patches/031_glxinfo_makefile.diff: Always link with g++. Patch from Branden. Modified: trunk/debian/CHANGESETS =================================================================== --- trunk/debian/CHANGESETS 2004-07-28 19:59:06 UTC (rev 1692) +++ trunk/debian/CHANGESETS 2004-07-28 21:26:07 UTC (rev 1693) @@ -169,4 +169,7 @@ Update MANIFEST and .install files accordingly. (Closes: #255701) 1683 +Always link glxinfo with g++ (patch 031). + 1692 + vim:set ai et sts=4 sw=4 tw=80: Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2004-07-28 19:59:06 UTC (rev 1692) +++ trunk/debian/changelog 2004-07-28 21:26:07 UTC (rev 1693) @@ -147,6 +147,10 @@ is used (ccache users might see even more improvement). + Make the buildd admins hate us less. + Changes by Robert Millan: + + * Get glxinfo to link properly with g++ (instead of adding -lstdc++). + -- Branden Robinson <[EMAIL PROTECTED]> Wed, 21 Jul 2004 19:27:57 -0500 xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low Modified: trunk/debian/patches/031_glxinfo_makefile.diff =================================================================== --- trunk/debian/patches/031_glxinfo_makefile.diff 2004-07-28 19:59:06 UTC (rev 1692) +++ trunk/debian/patches/031_glxinfo_makefile.diff 2004-07-28 21:26:07 UTC (rev 1693) @@ -1,15 +1,15 @@ $Id$ -This patch fixes linking of glxinfo on systems by explicitly dragging in -libstdc++; patch by Robert Millan. +Use g++ for glxinfo, since it links against C++ libraries and otherwise +breaks on GNU/kFreeBSD (I can't tell why this used to work on GNU/Linux, +broken as it was..); patch by Branden. + -- Robert Millan ---- xc/programs/glxinfo/Imakefile.old 2003-04-03 18:51:56.000000000 +0200 -+++ xc/programs/glxinfo/Imakefile 2003-04-03 18:52:04.000000000 +0200 -@@ -15,6 +15,6 @@ +--- xc/programs/glxinfo/Imakefile.old 2002-11-22 23:56:03.000000000 +0100 ++++ xc/programs/glxinfo/Imakefile 2004-07-19 13:40:22.000000000 +0200 +@@ -17,4 +17,4 @@ - #endif + SYS_LIBRARIES = MathLibrary -- SYS_LIBRARIES = MathLibrary -+ SYS_LIBRARIES = MathLibrary -lstdc++ - - SimpleProgramTarget(glxinfo) +-SimpleProgramTarget(glxinfo) ++SimpleCplusplusProgramTarget(glxinfo)