| 1 |
mgorny 10/10/04 20:33:58 |
| 2 |
|
| 3 |
Added: xorg-server-1.7.6-tslib-as-needed.patch |
| 4 |
0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch |
| 5 |
0002-Fix-linking-with-tslib-with-Wl-as-needed.patch |
| 6 |
Removed: 1.7.5.902-fix-tslib-1.0-check.patch |
| 7 |
Log: |
| 8 |
Replace the tslib build patch with a set of new patches in order to fix bug #318609. The first patch fixes linking with tslib whenever pkg-config fails to find it but fallback check does. The second one fixes overall linking with tslib whenever -Wl,--as-needed is used. |
| 9 |
|
| 10 |
(Portage version: 2.2_rc88_p86/cvs/Linux x86_64) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.1 x11-base/xorg-server/files/xorg-server-1.7.6-tslib-as-needed.patch |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/files/xorg-server-1.7.6-tslib-as-needed.patch?rev=1.1&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/files/xorg-server-1.7.6-tslib-as-needed.patch?rev=1.1&content-type=text/plain |
| 17 |
|
| 18 |
Index: xorg-server-1.7.6-tslib-as-needed.patch |
| 19 |
=================================================================== |
| 20 |
From c5eeb329f06a3c58704351261f8633c0ed753f18 Mon Sep 17 00:00:00 2001 |
| 21 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 22 |
Date: Mon, 4 Oct 2010 19:02:29 +0200 |
| 23 |
Subject: [PATCH] Fix linking with tslib, with -Wl,--as-needed. |
| 24 |
|
| 25 |
--- |
| 26 |
configure.ac | 2 +- |
| 27 |
1 files changed, 1 insertions(+), 1 deletions(-) |
| 28 |
|
| 29 |
diff --git a/configure.ac b/configure.ac |
| 30 |
index 4408e86..47df6c3 100644 |
| 31 |
--- a/configure.ac |
| 32 |
+++ b/configure.ac |
| 33 |
@@ -1981,7 +1981,7 @@ if test "$KDRIVE" = yes; then |
| 34 |
KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB" |
| 35 |
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS" |
| 36 |
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB" |
| 37 |
- KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS" |
| 38 |
+ KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $TSLIB_LIBS" |
| 39 |
|
| 40 |
AC_SUBST([XEPHYR_LIBS]) |
| 41 |
AC_SUBST([XEPHYR_INCS]) |
| 42 |
-- |
| 43 |
1.7.3.1 |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
1.1 x11-base/xorg-server/files/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch |
| 49 |
|
| 50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/files/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch?rev=1.1&view=markup |
| 51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/files/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch?rev=1.1&content-type=text/plain |
| 52 |
|
| 53 |
Index: 0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch |
| 54 |
=================================================================== |
| 55 |
From 7cf37a8247205335657dd7a644856bbaf619b7ce Mon Sep 17 00:00:00 2001 |
| 56 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 57 |
Date: Mon, 4 Oct 2010 18:38:44 +0200 |
| 58 |
Subject: [PATCH 1/2] Fix tslib check fallback to set TSLIB_LIBS. |
| 59 |
|
| 60 |
If pkg-config is unable to find tslib but the fallback check does find |
| 61 |
it, the compilation continues with tslib support enabled though |
| 62 |
TSLIB_LIBS is unset. Thus, the compilation fails with a linking error on |
| 63 |
tslib functions. |
| 64 |
|
| 65 |
This patch sets TSLIB_LIBS to '-lts' whenever the tslib fallback check |
| 66 |
succeds. |
| 67 |
--- |
| 68 |
configure.ac | 5 ++++- |
| 69 |
1 files changed, 4 insertions(+), 1 deletions(-) |
| 70 |
|
| 71 |
diff --git a/configure.ac b/configure.ac |
| 72 |
index c0bf98f..6d63663 100644 |
| 73 |
--- a/configure.ac |
| 74 |
+++ b/configure.ac |
| 75 |
@@ -2034,7 +2034,10 @@ if test "$KDRIVE" = yes; then |
| 76 |
|
| 77 |
PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"]) |
| 78 |
if test "x$HAVE_TSLIB" = xno; then |
| 79 |
- AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"]) |
| 80 |
+ AC_CHECK_LIB(ts, ts_open, [ |
| 81 |
+ HAVE_TSLIB="yes" |
| 82 |
+ TSLIB_LIBS="-lts" |
| 83 |
+ ]) |
| 84 |
fi |
| 85 |
|
| 86 |
if test "xTSLIB" = xauto; then |
| 87 |
-- |
| 88 |
1.7.3.1 |
| 89 |
|
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
1.1 x11-base/xorg-server/files/0002-Fix-linking-with-tslib-with-Wl-as-needed.patch |
| 94 |
|
| 95 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/files/0002-Fix-linking-with-tslib-with-Wl-as-needed.patch?rev=1.1&view=markup |
| 96 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/files/0002-Fix-linking-with-tslib-with-Wl-as-needed.patch?rev=1.1&content-type=text/plain |
| 97 |
|
| 98 |
Index: 0002-Fix-linking-with-tslib-with-Wl-as-needed.patch |
| 99 |
=================================================================== |
| 100 |
From 39193982958d8e3c433f32d834912129e360d377 Mon Sep 17 00:00:00 2001 |
| 101 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 102 |
Date: Mon, 4 Oct 2010 19:02:29 +0200 |
| 103 |
Subject: [PATCH 2/2] Fix linking with tslib, with -Wl,--as-needed. |
| 104 |
|
| 105 |
--- |
| 106 |
configure.ac | 2 +- |
| 107 |
1 files changed, 1 insertions(+), 1 deletions(-) |
| 108 |
|
| 109 |
diff --git a/configure.ac b/configure.ac |
| 110 |
index 6d63663..e8f9473 100644 |
| 111 |
--- a/configure.ac |
| 112 |
+++ b/configure.ac |
| 113 |
@@ -2122,7 +2122,7 @@ if test "$KDRIVE" = yes; then |
| 114 |
KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB" |
| 115 |
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS" |
| 116 |
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB" |
| 117 |
- KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS" |
| 118 |
+ KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS" |
| 119 |
|
| 120 |
AC_SUBST([XEPHYR_LIBS]) |
| 121 |
AC_SUBST([XEPHYR_INCS]) |
| 122 |
-- |
| 123 |
1.7.3.1 |
Archives