Re: X Strike Force SVN commit: rev 231 - in branches/4.3.0/sid/debian: . patches
>>>>> In <[🔎] 20030622082838.A7F705C0A8@necrotic.deadbeast.net>
>>>>> X Strike Force SVN Admin <branden@debian.org> wrote:
>> Author: daniel
>> Date: 2003-06-22 03:28:31 -0500 (Sun, 22 Jun 2003)
>> New Revision: 231
>> + * fix weak deps (libGLU->libGL, many on X11/Xext in xlibs):
>> + - patch #003: updated - set SharedFooReqs. (closes: #187365, #187374)
>> Modified: branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff
>> ==============================================================================
>> --- branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff 2003-06-22 08:24:51 UTC (rev 230)
>> +++ branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff 2003-06-22 08:28:31 UTC (rev 231)
>> @@ -77,7 +77,7 @@
>> # define XF86SetupUsesStaticTcl NO
>> /* un-comment this when it is un-broken */
>> /* # define JoystickSupport YES */
>> -@@ -146,14 +152,59 @@
>> +@@ -146,14 +152,64 @@
>> # define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm
>> # define BuildRman NO
>> # define BuildHtmlManPages NO
>> @@ -114,6 +114,11 @@
>> +# define XftLibraryDir $(TOP)/../../debian/local/exports
>> +# define XcursorLibraryDir $(TOP)/../../debian/local/exports
>> +# endif
>> ++# define SharedXpmReqs -L../X11 -lX11
>> ++# define SharedXpReqs -L../X11 -L../Xext -lX11 -lXext
>> ++# define SharedXmuuReqs -L../X11 -lX11
>> ++# define SharedXrandrReqs -L../X11 -L../Xext -L$(TOP)/../../debian/local/exports/lib -lX11 -lXext -lXrender
>> ++# define SharedGLUReqs -lGL
Bug #187365, #187374 are not only happned on Debian GNU/Linux,
I believe they are generic bugs on Linux based system.
So, It is better to put them into xc/config/cf/lnxLib.tmpl.
--- xc/config/cf/lnxLib.tmpl.orig 2003-06-22 20:17:28.000000000 +0900
+++ xc/config/cf/lnxLib.tmpl 2003-06-22 20:20:48.000000000 +0900
@@ -32,6 +32,11 @@
#define SharedXtstReqs $(LDPRELIB) $(XLIB)
#define SharedXieReqs $(LDPRELIB) $(XLIBONLY)
#define SharedSMReqs $(LDPRELIB) $(ICELIB)
+#define SharedXpmReqs $(LDPRELIB) $(XONLYLIB)
+#define SharedXpReqs $(LDPRELIB) $(EXTENSIONLIB) $(XONLYLIB)
+#define SharedXmuuReqs $(LDPRELIB) $(XONLYLIB)
+#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(EXTENSIONLIB) $(XONLYLIB)
+#define SharedGLUReqs $(LDPRELIB) $(GLXLIB)
#if GlxUseBuiltInDRIDriver
#define ExtraSharedGLReqs /**/
--
ISHIKAWA Mutsumi
<ishikawa@linux.or.jp>, <ishikawa@debian.org>, <ishikawa@netvillage.co.jp>
Reply to: