Gentoo Archives: gentoo-commits

From: "Michael Weber (xmw)" <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/mosh/files: mosh-1.2-shared-skalibs-fix-configure.patch mosh-1.2-shared-skalibs.patch
Date: Tue, 01 May 2012 09:04:42
Message-Id: 20120501090427.16A0A2004C@flycatcher.gentoo.org
1 xmw 12/05/01 09:04:27
2
3 Added: mosh-1.2-shared-skalibs-fix-configure.patch
4 mosh-1.2-shared-skalibs.patch
5 Log:
6 Fix prefix build.
7
8 (Portage version: 2.1.10.49/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 net-misc/mosh/files/mosh-1.2-shared-skalibs-fix-configure.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mosh/files/mosh-1.2-shared-skalibs-fix-configure.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mosh/files/mosh-1.2-shared-skalibs-fix-configure.patch?rev=1.1&content-type=text/plain
15
16 Index: mosh-1.2-shared-skalibs-fix-configure.patch
17 ===================================================================
18 --- mosh-1.2/configure
19 +++ mosh-1.2/configure
20 @@ -6147,6 +6147,7 @@
21 ;
22 return 0;
23 }
24 +char const * PROG = "mosh-test";
25 _ACEOF
26 if ac_fn_c_try_link "$LINENO"; then :
27 ac_cv_lib_stddjb_main=yes
28
29
30
31 1.1 net-misc/mosh/files/mosh-1.2-shared-skalibs.patch
32
33 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mosh/files/mosh-1.2-shared-skalibs.patch?rev=1.1&view=markup
34 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mosh/files/mosh-1.2-shared-skalibs.patch?rev=1.1&content-type=text/plain
35
36 Index: mosh-1.2-shared-skalibs.patch
37 ===================================================================
38 --- mosh-1.2/configure.ac
39 +++ mosh-1.2/configure.ac
40 @@ -163,7 +163,7 @@
41 [with_skalibs=$withval
42 AS_IF([test x"$withval" != xyes],
43 [SKALIBS_CPPFLAGS="-I$withval/include"
44 - SKALIBS_LDFLAGS="-L$withval/lib"])],
45 + SKALIBS_LDFLAGS="-L$withval/lib -lrt"])],
46 [with_skalibs=no])
47 AC_ARG_WITH([skalibs-include],
48 [AS_HELP_STRING([--with-skalibs-include=DIR],
49 @@ -172,7 +172,7 @@
50 AC_ARG_WITH([skalibs-libdir],
51 [AS_HELP_STRING([--with-skalibs-libdir=DIR],
52 [specify exact library dir for skalibs libraries])],
53 - [SKALIBS_LDFLAGS="-L$withval"])
54 + [SKALIBS_LDFLAGS="-L$withval -lrt"])
55
56 STDDJB_CPPFLAGS=""
57 STDDJB_LDFLAGS=""
58 @@ -360,9 +360,6 @@
59
60 AC_CONFIG_FILES([
61 Makefile
62 - third/Makefile
63 - third/libstddjb/Makefile
64 - third/poll/Makefile
65 src/Makefile
66 src/crypto/Makefile
67 src/frontend/Makefile
68 --- mosh-1.2/src/frontend/mosh-server.cc
69 +++ mosh-1.2/src/frontend/mosh-server.cc
70 @@ -750,3 +750,5 @@
71 struct stat buf;
72 return (0 == lstat( ".hushlogin", &buf ));
73 }
74 +
75 +char const * PROG = "mosh-server" ;
76 --- mosh-1.2/src/frontend/mosh-client.cc
77 +++ mosh-1.2/src/frontend/mosh-client.cc
78 @@ -140,3 +140,5 @@
79
80 return 0;
81 }
82 +
83 +char const * PROG = "mosh-client" ;
84 --- mosh-1.2/src/examples/termemu.cc
85 +++ mosh-1.2/src/examples/termemu.cc
86 @@ -324,3 +324,5 @@
87
88 swrite( STDOUT_FILENO, Terminal::Emulator::close().c_str() );
89 }
90 +
91 +char const * PROG = "termemu" ;
92 --- mosh-1.2/Makefile.am
93 +++ mosh-1.2/Makefile.am
94 @@ -1,3 +1,3 @@
95 ACLOCAL_AMFLAGS = -I m4
96 -SUBDIRS = third src scripts man
97 +SUBDIRS = src scripts man
98 EXTRA_DIST = autogen.sh ocb-license.html README.md