aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaksim 'max_posedon' Melnikau <maxposedon@gmail.com>2009-03-25 11:04:49 +0000
committerMaksim 'max_posedon' Melnikau <maxposedon@gmail.com>2009-03-25 11:04:49 +0000
commitd0bb9be839c8d892444b843fb52b8d71ca666786 (patch)
treedd7ecea5c6a78d0c2d335f59c727ee199d8a710a /x11-base
parent* sync with upstream xorg-server ebuild, (diff)
downloadembedded-cross-d0bb9be839c8d892444b843fb52b8d71ca666786.tar.gz
embedded-cross-d0bb9be839c8d892444b843fb52b8d71ca666786.tar.bz2
embedded-cross-d0bb9be839c8d892444b843fb52b8d71ca666786.zip
update fix cross pthread patch
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/Manifest2
-rw-r--r--x11-base/xorg-server/files/1.5.3-fix-cross-pthread.patch4
2 files changed, 3 insertions, 3 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 968ee89..3e2b1e8 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,6 @@
AUX 1.4-fix-kdrive-automake.patch 382 RMD160 78062824a416a2b452866d50592cc71bf34b13be SHA1 f21a54aed8eae1e718f2f0c262c37c36ccccd152 SHA256 126b67332c902802da506970acf253030004e4f7e17b3b6d2e68dd6b7bb0db81
AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237
-AUX 1.5.3-fix-cross-pthread.patch 1566 RMD160 0b3d15f64f5f799f5eec9ddcd1a3293c74406121 SHA1 43c7e4fb142650e9de0ee6782180831525ec856a SHA256 38c81bb4030513d90cc2124a8e5d6af92f3979949438e9df8cb11cec5517efe8
+AUX 1.5.3-fix-cross-pthread.patch 1566 RMD160 f82832e5b527135ef1080745c3894e69f1732292 SHA1 41acc0e0e951abbd500ea78592b18b1e92a8e709 SHA256 00855659d955438e8ab32096ab38fa2e6d21de31ac5c12c3beae47e794defacc
DIST xorg-server-1.5.3-gentoo-patches-07.tar.bz2 56276 RMD160 97afcb579d9ee10f4b2c715538557faa5d5f0eb6 SHA1 b48ea89f36e53062c4b903e613da48791bc36f64 SHA256 b80b45acb18068e7b4516cb58253f4cf1cd505f4d1a1b0b1c53e22ec7c12315b
DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea4499810021d0eed SHA1 177529b6d7191a73df6abf2990cd7708398a8d81 SHA256 a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
EBUILD xorg-server-1.5.3-r5.ebuild 16793 RMD160 e79008b8639b1ba771cf0cade2fd417a7bcc1447 SHA1 b5eb6e901d2aa9b3d3f049cd5bca3943752c76d8 SHA256 68237bdd5dcda559ddc08f7fce7e5c636d3e521bb8965f9e108a05d659bd118c
diff --git a/x11-base/xorg-server/files/1.5.3-fix-cross-pthread.patch b/x11-base/xorg-server/files/1.5.3-fix-cross-pthread.patch
index 5b9a6d7..1dc3f06 100644
--- a/x11-base/xorg-server/files/1.5.3-fix-cross-pthread.patch
+++ b/x11-base/xorg-server/files/1.5.3-fix-cross-pthread.patch
@@ -16,8 +16,8 @@
XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DIX_LIB $OS_LIB $CONFIG_LIB"
XNEST_SYS_LIBS="$XNESTMODULES_LIBS"
+ if test "x$GLX_USE_TLS" = xyes; then
-+ XNEXT_SYS_LIBS="$XNEXT_SYS_LIBS -lpthread"
-+ XNEXT_DEFINES="-DPTHREADS"
++ XNEST_SYS_LIBS="$XNEST_SYS_LIBS -lpthread"
++ XNEST_DEFINES="-DPTHREADS"
+ fi
AC_SUBST([XNEST_LIBS])
AC_SUBST([XNEST_SYS_LIBS])