diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
| commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
| tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-util/bdelta/files | |
| parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) | |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-util/bdelta/files')
| -rw-r--r-- | dev-util/bdelta/files/bdelta-0.3.1-gcc-6.patch | 18 | ||||
| -rw-r--r-- | dev-util/bdelta/files/bdelta-0.3.1-soname.patch | 21 |
2 files changed, 0 insertions, 39 deletions
diff --git a/dev-util/bdelta/files/bdelta-0.3.1-gcc-6.patch b/dev-util/bdelta/files/bdelta-0.3.1-gcc-6.patch deleted file mode 100644 index 9c998de37c3e..000000000000 --- a/dev-util/bdelta/files/bdelta-0.3.1-gcc-6.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/libbdelta.cpp b/src/libbdelta.cpp -index b11bb2b..d769b0d 100644 ---- a/src/libbdelta.cpp -+++ b/src/libbdelta.cpp -@@ -117,7 +117,3 @@ unsigned match_backward(BDelta_Instance *b, unsigned p1, unsigned p2, unsigned b - // Iterator helper function --template <class T> --inline T prior(T i) {return --i;} --template <class T> --inline T next(T i) {return ++i;} -- -+template <class T> inline T bdelta_next(T i) {return ++i;} - -@@ -423,3 +419,3 @@ void bdelta_pass(BDelta_Instance *b, unsigned blocksize, unsigned minMatchSize, - if (! maxHoleSize || (u1.num <= maxHoleSize && u2.num <= maxHoleSize)) -- if (! (flags & BDELTA_SIDES_ORDERED) || (next(u1.ml) == u1.mr && next(u2.ml) == u2.mr)) -+ if (! (flags & BDELTA_SIDES_ORDERED) || (bdelta_next(u1.ml) == u1.mr && bdelta_next(u2.ml) == u2.mr)) - bdelta_pass_2(b, blocksize, minMatchSize, &u1, 1, &u2, 1); diff --git a/dev-util/bdelta/files/bdelta-0.3.1-soname.patch b/dev-util/bdelta/files/bdelta-0.3.1-soname.patch deleted file mode 100644 index 360a16d7c0da..000000000000 --- a/dev-util/bdelta/files/bdelta-0.3.1-soname.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index 65fb88d..3b4a261 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -3,6 +3,7 @@ PREFIX ?= /usr - BINDIR ?= $(PREFIX)/bin - LIBDIR ?= ${PREFIX}/lib - CXXFLAGS += -O2 -+DYLIB_LDFLAGS ?= -Wl,-soname,libbdelta.so - - ifeq ($(shell uname -s),Darwin) - SHAREDLIB := libbdelta.dylib -@@ -19,7 +20,7 @@ libbdelta.a: libbdelta.cpp compatibility.h checksum.h file.h - $(AR) rs $@ $<.o - - libbdelta.so: libbdelta.cpp compatibility.h checksum.h file.h -- $(CXX) -shared -fPIC $(CXXFLAGS) $(LDFLAGS) $< -o $@ -+ $(CXX) -shared -fPIC $(CXXFLAGS) $(LDFLAGS) $(DYLIB_LDFLAGS) $< -o $@ - - libbdelta.dylib: libbdelta.cpp compatibility.h checksum.h file.h - $(CXX) -dynamiclib $(CXXFLAGS) $< -o $@ |