diff options
| -rw-r--r-- | net-misc/xrdp/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/xrdp/files/xrdp-0.4.1-asneeded.patch | 61 | ||||
| -rw-r--r-- | net-misc/xrdp/xrdp-0.4.1.ebuild | 4 |
3 files changed, 69 insertions, 2 deletions
diff --git a/net-misc/xrdp/ChangeLog b/net-misc/xrdp/ChangeLog index 1f2967d5a2da..1c18d7c22903 100644 --- a/net-misc/xrdp/ChangeLog +++ b/net-misc/xrdp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/xrdp # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/ChangeLog,v 1.4 2009/03/01 15:09:11 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/ChangeLog,v 1.5 2009/12/21 14:09:33 ssuominen Exp $ + + 21 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> xrdp-0.4.1.ebuild, + +files/xrdp-0.4.1-asneeded.patch: + Fix building with -Wl,--as-needed wrt #294682 by Kacper Kowalik. *xrdp-0.4.1 (01 Mar 2009) diff --git a/net-misc/xrdp/files/xrdp-0.4.1-asneeded.patch b/net-misc/xrdp/files/xrdp-0.4.1-asneeded.patch new file mode 100644 index 000000000000..416b2f09d9ad --- /dev/null +++ b/net-misc/xrdp/files/xrdp-0.4.1-asneeded.patch @@ -0,0 +1,61 @@ +--- xrdp-0.4.1.orig/sesman/tools/Makefile 2009-12-07 22:03:55.838226647 +0100 ++++ xrdp-0.4.1/sesman/tools/Makefile 2009-12-07 22:04:36.887226858 +0100 +@@ -14,17 +14,18 @@ + DEFINES = -DLIBSCP_CLIENT + + CFLAGS += -I../../common -I../ -I/usr/include/nptl -I../libscp $(DEFINES) +-LDFLAGS = -L/usr/gnu/lib -L/usr/lib64/nptl -L../libscp -Wl,-rpath,/usr/lib64/xrdp -lpthread -ldl -lscp ++LDFLAGS = -L/usr/gnu/lib -L/usr/lib64/nptl -L../libscp -Wl,-rpath,/usr/lib64/xrdp ++LIBS = -lpthread -ldl -lscp + C_OS_FLAGS = $(CFLAGS) -c + CC = gcc + + all: stest srun + + stest: $(SESTESTOBJ) +- $(CC) $(LDFLAGS) -o sestest $(SESTESTOBJ) ++ $(CC) $(LDFLAGS) -o sestest $(SESTESTOBJ) $(LIBS) + + srun: $(SESRUNOBJ) +- $(CC) $(LDFLAGS) -o sesrun $(SESRUNOBJ) ++ $(CC) $(LDFLAGS) -o sesrun $(SESRUNOBJ) $(LIBS) + + os_calls.o: ../../common/os_calls.c + $(CC) $(C_OS_FLAGS) ../../common/os_calls.c +--- xrdp-0.4.1.orig/sesman/Makefile 2009-12-07 22:24:37.898477114 +0100 ++++ xrdp-0.4.1/sesman/Makefile 2009-12-07 22:25:50.484235036 +0100 +@@ -18,7 +18,8 @@ + -DSESMAN_DESTDIR=\"$(DESTDIR)\" + + CFLAGS += -I../common -I/usr/include/nptl -I./libscp $(DEFINES) +-LDFLAGS = -L/usr/gnu/lib -L/usr/lib64/nptl -L./libscp -Wl,-rpath,/usr/lib64/xrdp -lpthread -ldl -lscp ++LDFLAGS = -L/usr/gnu/lib -L/usr/lib64/nptl -L./libscp -Wl,-rpath,/usr/lib64/xrdp ++LIBS=-lpthread -ldl -lscp + C_OS_FLAGS = $(CFLAGS) -c + CC = gcc + +@@ -29,19 +30,19 @@ + kerberos: libscp_ kerberos-base tools + + no-pam: $(SESMANOBJ) verify_user.o +- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user.o -lcrypt ++ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user.o -lcrypt $(LIBS) + + pam: $(SESMANOBJ) verify_user_pam.o +- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam.o -lpam ++ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam.o -lpam $(LIBS) + + pam_userpass: $(SESMANOBJ) verify_user_pam_userpass.o +- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam_userpass.o -lpam -lpam_userpass ++ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_pam_userpass.o -lpam -lpam_userpass $(LIBS) + + kerberos-base: $(SESMANOBJ) verify_user_kerberos.o +- $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_kerberos.o -lkrb5 ++ $(CC) $(LDFLAGS) -o sesman $(SESMANOBJ) verify_user_kerberos.o -lkrb5 $(LIBS) + + sessvc: $(SESSVCOBJ) +- $(CC) $(LDFLAGS) -o sessvc $(SESSVCOBJ) ++ $(CC) $(LDFLAGS) -o sessvc $(SESSVCOBJ) $(LIBS) + + tools: sessvc + make -C tools diff --git a/net-misc/xrdp/xrdp-0.4.1.ebuild b/net-misc/xrdp/xrdp-0.4.1.ebuild index b7acb408aee2..a9f3de5aa53c 100644 --- a/net-misc/xrdp/xrdp-0.4.1.ebuild +++ b/net-misc/xrdp/xrdp-0.4.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.4.1.ebuild,v 1.1 2009/03/01 15:09:11 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/xrdp/xrdp-0.4.1.ebuild,v 1.2 2009/12/21 14:09:33 ssuominen Exp $ EAPI="2" @@ -36,6 +36,8 @@ src_unpack() { done sed -i '/instfiles\/xrdp_control1.sh/ d' Makefile + + epatch "${FILESDIR}"/${P}-asneeded.patch } src_compile() { |