Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ryan Hill (dirtyepic)" <dirtyepic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-fs/fex/files: fex-0.8.18-gcc4.patch digest-fex-0.8.18-r1 fex-0.8.18-lpthread.patch digest-fex-0.8.18
Date: Sat, 29 Dec 2007 03:56:16
Message-Id: E1J8Snv-0006uQ-J7@stork.gentoo.org
1 dirtyepic 07/12/29 03:56:07
2
3 Added: fex-0.8.18-gcc4.patch digest-fex-0.8.18-r1
4 fex-0.8.18-lpthread.patch
5 Removed: digest-fex-0.8.18
6 Log:
7 Revision bump.
8 - fix building with GCC 4 (bug #182009)
9 - fix building against log4cpp-1.0 by linking with -lpthread
10 - added debug USE flag
11 - respect user CFLAGS
12 - ebuild cleanup
13 (Portage version: 2.1.4_rc11)
14
15 Revision Changes Path
16 1.1 net-fs/fex/files/fex-0.8.18-gcc4.patch
17
18 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/fex/files/fex-0.8.18-gcc4.patch?rev=1.1&view=markup
19 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/fex/files/fex-0.8.18-gcc4.patch?rev=1.1&content-type=text/plain
20
21 Index: fex-0.8.18-gcc4.patch
22 ===================================================================
23 diff -Naur fex-0.8.18-orig/src/client.cpp fex-0.8.18/src/client.cpp
24 --- fex-0.8.18-orig/src/client.cpp 2004-12-19 17:49:45.000000000 -0600
25 +++ fex-0.8.18/src/client.cpp 2007-12-28 21:03:30.000000000 -0600
26 @@ -53,7 +53,7 @@
27 {
28 lc.info("start fullsync");
29 parent().write(fex_header(ME_FullSyncStart));
30 - parent().wp()->createStateFile((unsigned)this, &_M_ClientFile);
31 + parent().wp()->createStateFile((unsigned long)this, &_M_ClientFile);
32 }
33
34 void FullSyncDialog::
35 diff -Naur fex-0.8.18-orig/src/dialog.cpp fex-0.8.18/src/dialog.cpp
36 --- fex-0.8.18-orig/src/dialog.cpp 2005-05-11 10:20:52.000000000 -0600
37 +++ fex-0.8.18/src/dialog.cpp 2007-12-28 21:03:58.000000000 -0600
38 @@ -224,7 +224,7 @@
39 ModLog::iterator i;
40 for(i = _M_Log.begin(); i != _M_Log.end(); i++) {
41 if (! FileListener::get().lock(parent().wp()->path() + i->first.str(),
42 - (unsigned int)&parent())) {
43 + (unsigned long)&parent())) {
44 ModLog::iterator j;
45 for(j = _M_Log.begin(); j != i; j++) {
46 FileListener::get().unlock(parent().wp(),
47 diff -Naur fex-0.8.18-orig/src/filelistener.cpp fex-0.8.18/src/filelistener.cpp
48 --- fex-0.8.18-orig/src/filelistener.cpp 2005-06-07 09:49:06.000000000 -0600
49 +++ fex-0.8.18/src/filelistener.cpp 2007-12-28 21:04:42.000000000 -0600
50 @@ -355,7 +355,7 @@
51
52 _M_FDBuffer[0].reserve(MinFDBufferSize);
53 _M_FDBuffer[1].reserve(MinFDBufferSize);
54 - _S_SignalBuffer = (int)&_M_FDBuffer[0];
55 + _S_SignalBuffer = (long)&_M_FDBuffer[0];
56 _M_ReadBuffer = &_M_FDBuffer[1];
57
58 assert(! _S_WakeUpPipe.first);
59 @@ -439,7 +439,7 @@
60 typedef FileListener::FileEvent::reqs_m::iterator iterator;
61
62 _M_ReadBuffer->reserve(_M_Handler->size() + MinFDBufferSize);
63 - _S_SignalBuffer = (int)_M_ReadBuffer;
64 + _S_SignalBuffer = (long)_M_ReadBuffer;
65 _M_ReadBuffer = &_M_FDBuffer[_M_ReadBuffer == &_M_FDBuffer[0] ? 1 : 0];
66
67 if (_S_RenewAll) {
68 diff -Naur fex-0.8.18-orig/src/nmstl/netioevent fex-0.8.18/src/nmstl/netioevent
69 --- fex-0.8.18-orig/src/nmstl/netioevent 2004-12-12 16:34:50.000000000 -0600
70 +++ fex-0.8.18/src/nmstl/netioevent 2007-12-28 21:05:51.000000000 -0600
71 @@ -138,7 +138,7 @@
72 io_handler::set_ioh;
73
74 private:
75 - inline void tcp_acceptor::ravail() {
76 + inline void ravail() {
77 address a;
78 tcpsocket ioh = sock.accept(a);
79 if (ioh) {
80 @@ -168,7 +168,7 @@
81 virtual ~tcp_acceptor() {}
82
83 protected:
84 - inline void tcp_acceptor::ravail() {
85 + inline void ravail() {
86 address a;
87 tcpsocket ioh = sock.accept(a);
88 if (ioh) {
89 diff -Naur fex-0.8.18-orig/src/server.cpp fex-0.8.18/src/server.cpp
90 --- fex-0.8.18-orig/src/server.cpp 2004-12-19 17:51:23.000000000 -0600
91 +++ fex-0.8.18/src/server.cpp 2007-12-28 21:06:27.000000000 -0600
92 @@ -81,7 +81,7 @@
93 sendStatFile()
94 {
95 size_t size;
96 - size = parent().wp()->createStateFile((unsigned)this, &_M_StateFile);
97 + size = parent().wp()->createStateFile((unsigned long)this, &_M_StateFile);
98 omessage msg;
99 msg << _M_StateFile << size;
100 write(fex_header(ME_FullSyncState), msg);
101 diff -Naur fex-0.8.18-orig/src/watchpoint.cpp fex-0.8.18/src/watchpoint.cpp
102 --- fex-0.8.18-orig/src/watchpoint.cpp 2004-12-27 08:40:40.000000000 -0600
103 +++ fex-0.8.18/src/watchpoint.cpp 2007-12-28 21:07:31.000000000 -0600
104 @@ -188,7 +188,7 @@
105 unsigned int lock_id,
106 bool do_sync)
107 {
108 - if (lock_id == (unsigned int)this)
109 + if (lock_id == (unsigned long)this)
110 return;
111
112 pair<ModLog::iterator, bool> res = _M_WriteLog->insert(key, state);
113 @@ -327,7 +327,7 @@
114 save_state()
115 {
116 if (_M_Mode >= MO_fullsynched)
117 - wp()->createStateFile((unsigned)this, NULL);
118 + wp()->createStateFile((unsigned long)this, NULL);
119 }
120
121
122
123
124
125 1.1 net-fs/fex/files/digest-fex-0.8.18-r1
126
127 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/fex/files/digest-fex-0.8.18-r1?rev=1.1&view=markup
128 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/fex/files/digest-fex-0.8.18-r1?rev=1.1&content-type=text/plain
129
130 Index: digest-fex-0.8.18-r1
131 ===================================================================
132 MD5 a3f3e1e80b6e24dec232c469c77ec446 fex-0.8.18.tar.gz 388346
133 RMD160 545830f380616c1d1f8bc1b72f1d83696879bce5 fex-0.8.18.tar.gz 388346
134 SHA256 236928fdf3eb80298007c58563c045e138d1f9a91341a62bd4543591f60f78f1 fex-0.8.18.tar.gz 388346
135
136
137
138 1.1 net-fs/fex/files/fex-0.8.18-lpthread.patch
139
140 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/fex/files/fex-0.8.18-lpthread.patch?rev=1.1&view=markup
141 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/fex/files/fex-0.8.18-lpthread.patch?rev=1.1&content-type=text/plain
142
143 Index: fex-0.8.18-lpthread.patch
144 ===================================================================
145 diff -Naur fex-0.8.18-orig/configure.ac fex-0.8.18/configure.ac
146 --- fex-0.8.18-orig/configure.ac 2005-06-07 12:31:43.000000000 -0600
147 +++ fex-0.8.18/configure.ac 2007-12-28 21:49:27.000000000 -0600
148 @@ -21,9 +21,9 @@
149 [AS_HELP_STRING([--enable-debug], [build a debug version])])
150
151 if test "$enable_debug" = "yes"; then
152 - CXXFLAGS="${CXXFLAGS} -O0 -g3";
153 + CXXFLAGS="${CXXFLAGS}";
154 else
155 - CXXFLAGS="-O2 -DNDEBUG ${CXXFLAGS}";
156 + CXXFLAGS="-DNDEBUG ${CXXFLAGS}";
157 fi
158
159 AC_ARG_ENABLE([slink],
160 @@ -68,6 +68,8 @@
161 AC_CHECK_HEADERS([ext/malloc_allocator.h])
162 AC_CHECK_HEADERS([linux/inotify.h])
163
164 +FEX_LINK="${FEX_LINK} -lpthread"
165 +
166 AC_CHECK_LIB([rsync],
167 [rs_delta_file],
168 [],
169 @@ -89,7 +91,8 @@
170 AC_CHECK_LIB([log4cpp],
171 [main],
172 [],
173 - [AC_MSG_ERROR([liblog4cpp must be installed])])
174 + [AC_MSG_ERROR([liblog4cpp must be installed])],
175 + [-lpthread])
176
177 AC_HEADER_STDC
178 AC_HEADER_DIRENT
179
180
181
182 --
183 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups