Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv22076/10.7/stable/main/finkinfo/libs
Modified Files:
librsync.info librsync.patch
Log Message:
Update from
https://sourceforge.net/tracker/?func=detail&aid=3507047&group_id=17203&atid=414256.
No reply from maintainer after > 1 week, and it's a small change.
Index: librsync.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/librsync.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- librsync.info 1 Feb 2012 19:12:28 -0000 1.1
+++ librsync.info 30 Mar 2012 22:47:03 -0000 1.2
@@ -1,6 +1,6 @@
Package: librsync
Version: 0.9.7
-Revision: 1004
+Revision: 1005
Description: Algorithm for remote file synchronization
License: GPL
Homepage: http://librsync.sourceforge.net/
@@ -11,15 +11,14 @@
BuildDepends: bzip2-dev (>= 1.0.2-12), popt (>= 1.7-1), libiconv-dev,
libgettext8-dev, fink-package-precedence
BuildDependsOnly: true
GCC: 4.0
-SetCC: llvm-gcc-4.2
# Unpack Phase.
Source: mirror:sourceforge:librsync/%N-%v.tar.gz
Source-MD5: 24cdb6b78f45e0e83766903fd4f6bc84
# Patch Phase.
-PatchFIle: %n.patch
-PatchFile-MD5: 41d40afeceb725efff6311826f43dcca
+PatchFile: %n.patch
+PatchFile-MD5: 34b4a02424f7e5538c613c44df01e04d
PatchScript: <<
patch -p1 < %{PatchFile}
perl -pi.bak -e 's,hardcode_direct=yes,hardcode_direct=no,' configure
@@ -54,7 +53,7 @@
Files: bin share/man/man1
DocFiles: AUTHORS ChangeLog COPYING NEWS README README.CVS THANKS TODO
<<
-
+InfoTest: TestScript: make check || exit 2
# Documentation.
DescDetail: <<
librsync implements the rolling-checksum algorithm of remote file
@@ -70,12 +69,6 @@
This library was previously known as libhsync up to version 0.9.0.
<<
DescPackaging: <<
-Fails to build with clang, with no relevant warning:
-
-gcc -dynamiclib -o .libs/librsync.1.0.2.dylib .libs/prototab.o
.libs/base64.o .libs/buf.o .libs/checksum.o .libs/command.o .libs/delta.o
.libs/emit.o .libs/fileutil.o .libs/hex.o .libs/job.o .libs/mdfour.o
.libs/mksum.o .libs/msg.o .libs/netint.o .libs/patch.o .libs/readsums.o
.libs/rollsum.o .libs/scoop.o .libs/search.o .libs/stats.o .libs/stream.o
.libs/sumset.o .libs/trace.o .libs/tube.o .libs/util.o .libs/version.o
.libs/whole.o -L/sw/lib /sw/lib/libpopt.dylib -lbz2 -lz -install_name
/sw/lib/librsync.1.dylib -compatibility_version 2 -current_version 2.2
-Undefined symbols for architecture x86_64:
- "_rs_appendflush", referenced from:
- _rs_delta_s_scan in delta.o
- _rs_delta_s_flush in delta.o
-ld: symbol(s) not found for architecture x86_64
-<<
\ No newline at end of file
+Fix clang build with upstream patch from
+https://raw.github.com/m0use/librsync-clang-patches/master/librsync-0.9.7-clang.patch
+<<
Index: librsync.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/librsync.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- librsync.patch 1 Feb 2012 19:12:28 -0000 1.1
+++ librsync.patch 30 Mar 2012 22:47:03 -0000 1.2
@@ -30,3 +30,20 @@
if (!len)
return RS_BLOCKED;
+--- librsync-0.9.7/delta.c.orig 2012-03-17 10:59:31.000000000 -0400
++++ librsync-0.9.7/delta.c 2012-03-17 10:59:51.000000000 -0400
+@@ -126,10 +126,10 @@
+ static rs_result rs_delta_s_end(rs_job_t *job);
+ void rs_getinput(rs_job_t *job);
+ inline int rs_findmatch(rs_job_t *job, rs_long_t *match_pos, size_t
*match_len);
+-inline rs_result rs_appendmatch(rs_job_t *job, rs_long_t match_pos, size_t
match_len);
+-inline rs_result rs_appendmiss(rs_job_t *job, size_t miss_len);
+-inline rs_result rs_appendflush(rs_job_t *job);
+-inline rs_result rs_processmatch(rs_job_t *job);
++static inline rs_result rs_appendmatch(rs_job_t *job, rs_long_t match_pos,
size_t match_len);
++static inline rs_result rs_appendmiss(rs_job_t *job, size_t miss_len);
++static inline rs_result rs_appendflush(rs_job_t *job);
++static inline rs_result rs_processmatch(rs_job_t *job);
+ inline rs_result rs_processmiss(rs_job_t *job);
+
+ /**
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
