1 |
tetromino 14/01/03 20:13:16 |
2 |
|
3 |
Added: gdm-2.20.11-underlinking.patch |
4 |
Log: |
5 |
Fix underlinking failure (bug #496914, thanks to d_dart). |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 gnome-base/gdm/files/gdm-2.20.11-underlinking.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/files/gdm-2.20.11-underlinking.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/files/gdm-2.20.11-underlinking.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: gdm-2.20.11-underlinking.patch |
16 |
=================================================================== |
17 |
See https://bugs.gentoo.org/show_bug.cgi?id=496914 |
18 |
|
19 |
diff --git a/configure.ac b/configure.ac |
20 |
index 3da7f33..8a0eedf 100644 |
21 |
--- a/configure.ac |
22 |
+++ b/configure.ac |
23 |
@@ -160,6 +160,9 @@ AC_CHECK_TYPE(socklen_t,, |
24 |
|
25 |
AC_CHECK_FUNCS([setresuid setenv unsetenv clearenv getutxent updwtmpx logwtmp login logout]) |
26 |
|
27 |
+AC_CHECK_LIBM |
28 |
+AC_SUBST(LIBM) |
29 |
+ |
30 |
dnl checks needed for Darwin compatibility to linux **environ. |
31 |
AC_CHECK_HEADERS(crt_externs.h) |
32 |
AC_CHECK_FUNCS(_NSGetEnviron) |
33 |
diff --git a/gui/Makefile.am b/gui/Makefile.am |
34 |
index 577dc9f..3334381 100644 |
35 |
--- a/gui/Makefile.am |
36 |
+++ b/gui/Makefile.am |
37 |
@@ -123,6 +123,7 @@ gdmchooser_LDADD = \ |
38 |
$(XINERAMA_LIBS) \ |
39 |
$(X_LIBS) \ |
40 |
$(XDMCP_LIBS) \ |
41 |
+ -lXau \ |
42 |
-lX11 \ |
43 |
-lfontconfig \ |
44 |
$(NULL) |
45 |
@@ -143,8 +144,10 @@ gdmlogin_LDADD = \ |
46 |
$(X_EXTRA_LIBS) \ |
47 |
$(XINERAMA_LIBS) \ |
48 |
$(X_LIBS) \ |
49 |
+ -lXau \ |
50 |
-lX11 \ |
51 |
-lfontconfig \ |
52 |
+ $(LIBM) \ |
53 |
$(NULL) |
54 |
|
55 |
# LIBGNOMEUI should be removed from gdmsetup at some point. |
56 |
@@ -183,6 +186,7 @@ gdmphotosetup_LDADD = \ |
57 |
$(INTLLIBS) \ |
58 |
$(EXTRA_SOCKET_LIB) \ |
59 |
$(EXTRA_NSL_LIB) \ |
60 |
+ -lXau \ |
61 |
-lX11 \ |
62 |
-lfontconfig \ |
63 |
$(top_builddir)/common/libgdmcommon.a \ |
64 |
diff --git a/gui/greeter/Makefile.am b/gui/greeter/Makefile.am |
65 |
index fd0f500..7b9840d 100644 |
66 |
--- a/gui/greeter/Makefile.am |
67 |
+++ b/gui/greeter/Makefile.am |
68 |
@@ -91,6 +91,7 @@ gdmgreeter_LDADD = \ |
69 |
$(X_EXTRA_LIBS) \ |
70 |
$(XINERAMA_LIBS) \ |
71 |
$(X_LIBS) \ |
72 |
+ -lXau \ |
73 |
-lX11 \ |
74 |
-lfontconfig |