tags 554405 + pending thanks Dear maintainer,
I've prepared an NMU for freeglut (versioned as 2.6.0-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
--
Regards,
dai
GPG Fingerprint = 0B29 D88E 42E6 B765 B8D8 EA50 7839 619D D439 668E
diff -Nru freeglut-2.6.0/debian/changelog freeglut-2.6.0/debian/changelog --- freeglut-2.6.0/debian/changelog 2010-03-27 21:02:35.000000000 +0900 +++ freeglut-2.6.0/debian/changelog 2012-01-09 17:33:46.000000000 +0900 @@ -1,3 +1,13 @@ +freeglut (2.6.0-1.1) unstable; urgency=low + + * Non-maintainer upload. + * FTBFS with binutils-gold (Closes: #554405) + - debian/patches/04_ld_no_add_needed.diff + - debian/patches/05_gold.diff + thanks to Matthias Klose <d...@ubuntu.com>. + + -- HIGUCHI Daisuke (VDR dai) <d...@debian.org> Mon, 09 Jan 2012 17:23:54 +0900 + freeglut (2.6.0-1) unstable; urgency=low * New upstream release. diff -Nru freeglut-2.6.0/debian/patches/04_ld_no_add_needed.diff freeglut-2.6.0/debian/patches/04_ld_no_add_needed.diff --- freeglut-2.6.0/debian/patches/04_ld_no_add_needed.diff 1970-01-01 09:00:00.000000000 +0900 +++ freeglut-2.6.0/debian/patches/04_ld_no_add_needed.diff 2012-01-09 17:32:18.000000000 +0900 @@ -0,0 +1,20 @@ +Description: Fix build failures with --no-add-needed. +Author: Matthias Klose <d...@ubuntu.com> + +--- freeglut-2.6.0.orig/progs/demos/spaceball/Makefile.am ++++ freeglut-2.6.0/progs/demos/spaceball/Makefile.am +@@ -3,4 +3,5 @@ + noinst_PROGRAMS = spaceball + spaceball_SOURCES = spaceball.c vmath.c + spaceball_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la +-spaceball_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) +\ No newline at end of file ++spaceball_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) ++spaceball_LDADD = -lm +--- freeglut-2.6.0.orig/progs/demos/Lorenz/Makefile.am ++++ freeglut-2.6.0/progs/demos/Lorenz/Makefile.am +@@ -4,3 +4,4 @@ + lorenz_SOURCES = lorenz.c + lorenz_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la + lorenz_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) ++lorenz_LDADD = -lm diff -Nru freeglut-2.6.0/debian/patches/05_gold.diff freeglut-2.6.0/debian/patches/05_gold.diff --- freeglut-2.6.0/debian/patches/05_gold.diff 1970-01-01 09:00:00.000000000 +0900 +++ freeglut-2.6.0/debian/patches/05_gold.diff 2012-01-09 17:32:57.000000000 +0900 @@ -0,0 +1,86 @@ +Description: Fix FTBFS with ld.gold. +Bug-Debian: http://bugs.debian.org/554405 +Author: Matthias Klose <d...@ubuntu.com> + +--- freeglut-2.6.0.orig/progs/demos/spaceball/Makefile.am ++++ freeglut-2.6.0/progs/demos/spaceball/Makefile.am +@@ -2,6 +2,6 @@ EXTRA_DIST = spaceball.c vmath.c vmath.h + + noinst_PROGRAMS = spaceball + spaceball_SOURCES = spaceball.c vmath.c +-spaceball_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la ++spaceball_LDFLAGS = -export-dynamic + spaceball_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) +-spaceball_LDADD = -lm ++spaceball_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS) -lm +--- freeglut-2.6.0.orig/progs/demos/One/Makefile.am ++++ freeglut-2.6.0/progs/demos/One/Makefile.am +@@ -1,5 +1,6 @@ + EXTRA_DIST = one.c one.dsp + noinst_PROGRAMS = one + one_SOURCES = one.c +-one_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la ++one_LDFLAGS = -export-dynamic ++one_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS) + one_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) +--- freeglut-2.6.0.orig/progs/demos/CallbackMaker/Makefile.am ++++ freeglut-2.6.0/progs/demos/CallbackMaker/Makefile.am +@@ -1,5 +1,6 @@ + EXTRA_DIST = CallbackMaker.c CallbackMaker.dsp + noinst_PROGRAMS = CallbackMaker + CallbackMaker_SOURCES = CallbackMaker.c +-CallbackMaker_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la ++CallbackMaker_LDFLAGS = -export-dynamic ++CallbackMaker_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS) + CallbackMaker_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) +--- freeglut-2.6.0.orig/progs/demos/shapes/Makefile.am ++++ freeglut-2.6.0/progs/demos/shapes/Makefile.am +@@ -1,5 +1,6 @@ + EXTRA_DIST = shapes.c shapes.dsp + noinst_PROGRAMS = shapes + shapes_SOURCES = shapes.c +-shapes_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la ++shapes_LDFLAGS = -export-dynamic ++shapes_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS) + shapes_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) +--- freeglut-2.6.0.orig/progs/demos/Fractals_random/Makefile.am ++++ freeglut-2.6.0/progs/demos/Fractals_random/Makefile.am +@@ -2,5 +2,6 @@ EXTRA_DIST = Fractals_random.dsp fractal + + noinst_PROGRAMS = fractals_random + fractals_random_SOURCES = fractals_random.c +-fractals_random_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la ++fractals_random_LDFLAGS = -export-dynamic ++fractals_random_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS) + fractals_random_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) +--- freeglut-2.6.0.orig/progs/demos/Lorenz/Makefile.am ++++ freeglut-2.6.0/progs/demos/Lorenz/Makefile.am +@@ -2,6 +2,6 @@ EXTRA_DIST = lorenz.c lorenz.dsp + + noinst_PROGRAMS = lorenz + lorenz_SOURCES = lorenz.c +-lorenz_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la ++lorenz_LDFLAGS = -export-dynamic + lorenz_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) +-lorenz_LDADD = -lm ++lorenz_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS) -lm +--- freeglut-2.6.0.orig/progs/demos/Fractals/Makefile.am ++++ freeglut-2.6.0/progs/demos/Fractals/Makefile.am +@@ -1,5 +1,6 @@ + EXTRA_DIST = Fractals.dsp fractals.c fractals.dat + noinst_PROGRAMS = fractals + fractals_SOURCES = fractals.c +-fractals_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la ++fractals_LDFLAGS = -export-dynamic ++fractals_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS) + fractals_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) +--- freeglut-2.6.0.orig/progs/demos/smooth_opengl3/Makefile.am ++++ freeglut-2.6.0/progs/demos/smooth_opengl3/Makefile.am +@@ -1,5 +1,6 @@ + EXTRA_DIST = smooth_opengl3.c smooth_opengl3.dsp + noinst_PROGRAMS = smooth_opengl3 + smooth_opengl3_SOURCES = smooth_opengl3.c +-smooth_opengl3_LDFLAGS = -export-dynamic ../../../src/lib@LIBRARY@.la ++smooth_opengl3_LDFLAGS = -export-dynamic ++smooth_opengl3_LDADD = ../../../src/lib@LIBRARY@.la $(GL_LIBS) + smooth_opengl3_CFLAGS = -I$(top_srcdir)/include $(X_CFLAGS) diff -Nru freeglut-2.6.0/debian/patches/series freeglut-2.6.0/debian/patches/series --- freeglut-2.6.0/debian/patches/series 2010-03-27 21:02:35.000000000 +0900 +++ freeglut-2.6.0/debian/patches/series 2012-01-09 17:30:46.000000000 +0900 @@ -1,2 +1,4 @@ 01_fix_kfreebsd.diff 03_fix_hurd.diff +04_ld_no_add_needed.diff +05_gold.diff
signature.asc
Description: Digital signature
