df0e9fb363
I had moved libXThrStub into libX11, because it seemed unnecessary. However, because libc_r symbols are also weak, the weak stubs in libX11 would interfere, however they don't if they are in a library linked by libX11. The most common manifestation of the problem was: GThread-ERROR **: file gthread-posix.c: line 137 (g_thread_impl_init): error 'Invalid argument' during 'pthread_getschedparam (pthread_self(), &policy, &sched)' in glib apps. PR: ports/75477 Submitted by: KIMURA Yasuhiro, yasu at utahime dot org Testing by: marcus
79 lines
2.1 KiB
Cheetah
79 lines
2.1 KiB
Cheetah
--- X11.tmpl.orig Fri Sep 3 09:18:18 2004
|
|
+++ config/cf/X11.tmpl Wed Dec 29 13:42:37 2004
|
|
@@ -616,7 +616,7 @@
|
|
#define BuildXft1Library BuildRenderLibrary
|
|
#endif
|
|
#ifndef UseFontconfig
|
|
-#define UseFontconfig BuildXftLibrary
|
|
+#define UseFontconfig (BuildXftLibrary || BuildXft1Library)
|
|
#endif
|
|
#ifndef BuildFontconfigLibrary
|
|
#define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig)
|
|
@@ -773,6 +773,9 @@
|
|
#ifndef ThreadedProject
|
|
#define ThreadedProject ThreadedX
|
|
#endif
|
|
+#ifndef BuildThreadStubLibrary
|
|
+#define BuildThreadStubLibrary NO
|
|
+#endif
|
|
#ifndef NeedUIThrStubs
|
|
#define NeedUIThrStubs NO
|
|
#endif
|
|
@@ -1606,7 +1609,7 @@
|
|
#endif
|
|
|
|
#ifndef PsWrap
|
|
-# ifndef UseInstalled
|
|
+# if !defined(UseInstalled) && !defined(UseInstalledPrograms)
|
|
# define PsWrap $(PSWRAPSRC)/pswrap
|
|
# else
|
|
# define PsWrap pswrap
|
|
@@ -1683,7 +1686,7 @@
|
|
|
|
INSTAPPFLAGS = $(INSTDATFLAGS) /* XXX - this should go away - XXX */
|
|
|
|
-#if UseInstalledX11
|
|
+#if UseInstalledX11 || UseInstalledClients
|
|
RGB = $(XBINDIR)/rgb
|
|
FONTC = $(XBINDIR)/bdftopcf
|
|
MKFONTSCALE = $(XBINDIR)/mkfontscale
|
|
@@ -1843,6 +1846,39 @@
|
|
DEPXLIBONLY = $(DEPXONLYLIB)
|
|
XLIBONLY = $(XONLYLIB)
|
|
LINTXONLYLIB = $(LINTXONLY)
|
|
+
|
|
+#if BuildThreadStubLibrary
|
|
+#ifndef SharedLibXThrStub
|
|
+#define SharedLibXThrStub YES
|
|
+#endif
|
|
+#ifndef NormalLibXThrStub
|
|
+#define NormalLibXThrStub NO
|
|
+#endif
|
|
+#ifndef DebugLibXThrStub
|
|
+#define DebugLibXThrStub NO
|
|
+#endif
|
|
+#ifndef ProfileLibXThrStub
|
|
+#define ProfileLibXThrStub NO
|
|
+#endif
|
|
+ XTHRSTUBLIBSRC = $(LIBSRC)/XThrStub
|
|
+#if SharedLibXThrStub
|
|
+#ifndef SharedXThrStubRev
|
|
+#define SharedXThrStubRev 6.1
|
|
+#endif
|
|
+SharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBLIBSRC),SOXTHRSTUBREV,SharedXThrStubRev)
|
|
+#else
|
|
+ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir)
|
|
+#endif
|
|
+#else
|
|
+#undef SharedLibXThrStub
|
|
+#define SharedLibXThrStub NO
|
|
+#undef NormalLibXThrStub
|
|
+#define NormalLibXThrStub NO
|
|
+#undef DebugLibXThrStub
|
|
+#define DebugLibXThrStub NO
|
|
+#undef ProfileLibXThrStub
|
|
+#define ProfileLibXThrStub NO
|
|
+#endif
|
|
|
|
#if BuildScreenSaverLibrary
|
|
#ifndef SharedLibXss
|