X Strike Force SVN commit: rev 219 - in branches/4.3.0/sid/debian: . patches
Author: daniel
Date: 2003-06-19 08:12:09 -0500 (Thu, 19 Jun 2003)
New Revision: 219
Added:
branches/4.3.0/sid/debian/patches/061_libGLU_fix_weak_deps.diff
Modified:
branches/4.3.0/sid/debian/changelog
Log:
libGLU (patch #061, changelog): fix weak libGLU->libGL dep
Added: branches/4.3.0/sid/debian/patches/061_libGLU_fix_weak_deps.diff
==============================================================================
--- branches/4.3.0/sid/debian/patches/061_libGLU_fix_weak_deps.diff 2003-06-19 13:06:33 UTC (rev 218)
+++ branches/4.3.0/sid/debian/patches/061_libGLU_fix_weak_deps.diff 2003-06-19 13:12:09 UTC (rev 219)
@@ -0,0 +1,24 @@
+Fix a weak dependency on libGL from libGLU; this patch by Daniel Stone.
+
+--- xc/extras/ogl-sample/main/gfx/lib/glu/Imakefile.orig 2003-06-19 21:58:01.000000000 +1000
++++ xc/extras/ogl-sample/main/gfx/lib/glu/Imakefile 2003-06-19 21:58:40.000000000 +1000
+@@ -43,7 +43,7 @@
+ #if defined(LinuxArchitecture)
+ #define SharedLibraryCcCmd CplusplusCmd
+ SHLIBLDFLAGS = -shared -Wl,--whole-archive
+-REQUIREDLIBS = -Wl,--no-whole-archive
++REQUIREDLIBS = -Wl,--no-whole-archive -lGL
+ #else
+ REQUIREDLIBS = -lGL -lm -lc -lC
+ #endif
+--- xc/extras/ogl-sample/main/gfx/lib/glu/GNUmakefile.orig 2003-06-19 21:58:07.000000000 +1000
++++ xc/extras/ogl-sample/main/gfx/lib/glu/GNUmakefile 2003-06-19 21:58:31.000000000 +1000
+@@ -87,7 +87,7 @@
+ $(SUBDIRS_MAKERULE)
+
+ $(TARGET): $(DSOEXPORTS) $(SRCLIBS)
+- $(LD) $(LDDSOFLAGS) $(SRCLIBS) $(LDFLAGS) -o $@;
++ $(LD) $(LDDSOFLAGS) $(SRCLIBS) $(LDFLAGS) $(LLDLIBS) -o $@;
+
+ $(DSOEXPORTS): $(LIBSPEC_PARSER) $(TYPEMAPSDIR)/$(C_TYPEMAP) \
+ $(SPECDIR)/$(GLU_SPEC) exports.ls GNUmakefile
Modified: branches/4.3.0/sid/debian/changelog
==============================================================================
--- branches/4.3.0/sid/debian/changelog 2003-06-19 13:06:33 UTC (rev 218)
+++ branches/4.3.0/sid/debian/changelog 2003-06-19 13:12:09 UTC (rev 219)
@@ -34,6 +34,8 @@
- debian/control: add Build-Depends: libxrender-dev, libxcursor-dev
[ISHIKAWA Mutsumi]
+ * patch #061: fix weak dep from libGLU to libGL. (closes: #187365)
+
* xlibs-pic package renamed to xlibs-static-pic
- reintegrate piclib_support.diff (previously patch #046, now patch #909)
Reply to: