diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-libs/libmba/files | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/libmba/files')
-rw-r--r-- | dev-libs/libmba/files/libmba-0.9.1-glibc-2.20.patch | 34 | ||||
-rw-r--r-- | dev-libs/libmba/files/libmba-0.9.1-qa.patch | 96 |
2 files changed, 130 insertions, 0 deletions
diff --git a/dev-libs/libmba/files/libmba-0.9.1-glibc-2.20.patch b/dev-libs/libmba/files/libmba-0.9.1-glibc-2.20.patch new file mode 100644 index 000000000000..4d5651cc5d12 --- /dev/null +++ b/dev-libs/libmba/files/libmba-0.9.1-glibc-2.20.patch @@ -0,0 +1,34 @@ +--- a/src/mba/text.h ++++ b/src/mba/text.h +@@ -315,31 +315,6 @@ + /* "dumb" snprintf returns -1 on overflow */ + LIBMBA_API int dsnprintf(char *str, size_t size, const char *format, ...); + +-#if !defined(_GNU_SOURCE) +- +-#if !defined(_BSD_SOURCE) && \ +- !defined(_XOPEN_SOURCE_EXTENDED) && \ +- !defined(_WIN32) && \ +- !(defined(__APPLE__) && defined(__MACH__)) +-LIBMBA_API char *strdup(const char *s); +-#endif +- +-LIBMBA_API wchar_t *wcsdup(const wchar_t *s); +-LIBMBA_API size_t strnlen(const char *s, size_t maxlen); +- +-#if (__STDC_VERSION__ < 199901L) && \ +- !defined(_BSD_SOURCE) && \ +- (_XOPEN_VERSION < 500) && \ +- !(defined(__APPLE__) && defined(__MACH__)) +-#include <stdarg.h> +-int vsnprintf(char *str, size_t size, const char *format, va_list ap); +-#endif +- +-LIBMBA_API size_t wcsnlen(const wchar_t *s, size_t maxlen); +-LIBMBA_API int wcscasecmp(const wchar_t *s1, const wchar_t *s2); +- +-#endif /* _GNU_SOURCE */ +- + /* + wchar_t *wcschrnul(const wchar_t *s, wchar_t wc); + int wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n); diff --git a/dev-libs/libmba/files/libmba-0.9.1-qa.patch b/dev-libs/libmba/files/libmba-0.9.1-qa.patch new file mode 100644 index 000000000000..0f9859504f0a --- /dev/null +++ b/dev-libs/libmba/files/libmba-0.9.1-qa.patch @@ -0,0 +1,96 @@ +Addresing multiple QA issues: + - fixing CFLAGS, LDFLAGS, CC + - fixing parallel build + - fixing as-needed issues + - making static libs optional + - introducing make DESTDIR compatibility + - removing Makefile.PLATFORM bits, as they violate sandbox + +http://bugs.gentoo.org/show_bug.cgi?id=313673 + +Patch written by Kacper Kowalik <xarthisius.kk@gmail.com> + +--- a/Makefile ++++ b/Makefile +@@ -1,13 +1,13 @@ + # Makefile for libmba + # Supported flags: -DVARRAY_INIT_SIZE=N -DUSE_WCHAR + +-MFLAGS = -g -W1 -Isrc ++MFLAGS = -Isrc + MKTOOL = ./mktool + +-prefix = /usr/local ++prefix = $(DESTDIR)/usr + includedir = $(prefix)/include +-libdir = $(prefix)/lib +-mandir = $(prefix)/man ++libdir = $(prefix)/$(LIBDIR) ++mandir = $(prefix)/share/man + LIBNAME = mba + LIBVERS = 0.9.1 + ARNAME = lib$(LIBNAME).a +@@ -19,39 +19,49 @@ + MAN = diff.3m bitset.3m allocator.3m cfg.3m pool.3m varray.3m csv.3m text.3m path.3m suba.3m msgno.3m stack.3m linkedlist.3m hashmap.3m hexdump.3m shellout.3m eval.3m svsem.3m svcond.3m time.3m + MANGZ = $(MAN:.3m=.3m.gz) + ++.PHONY: all clean install uninstall install-ar uninstall-ar + .SUFFIXES: .pic.o .3m .3m.gz + +-all: mktool so ar ++ifeq ($(STATIC),1) ++all: $(MKTOOL) so ar ++install-ar: $(ARNAME) ++ -$(MKTOOL) -i $(ARNAME) $(libdir) ++uninstall-ar: ++ $(MKTOOL) -u $(ARNAME) $(libdir) ++else ++all: $(MKTOOL) so ++install-ar: ++uninstall-ar: ++endif + +-mktool: ++$(MKTOOL): mktool.c + $(CC) -g -o mktool mktool.c + +-ar: mktool $(OBJS) ++$(PICOBJS): $(MKTOOL) ++$(OBJS): $(MKTOOL) ++ ++ar: $(OBJS) + ar $(ARFLAGS) $(ARNAME) $(OBJS) + ranlib $(ARNAME) +-so: mktool $(PICOBJS) +- @$(MKTOOL) -l -v -libname $(LIBNAME) -libvers $(LIBVERS) -shared -soname -lutil $(PICOBJS) ++so: $(PICOBJS) ++ @$(MKTOOL) -l -v -libname $(LIBNAME) -libvers $(LIBVERS) -shared -soname $(LDFLAGS) $(PICOBJS) -lutil + + .c.pic.o: +- @$(MKTOOL) -c -v $(MFLAGS) -fpic -c -o $*.pic.o $< ++ @$(MKTOOL) -c -v $(CFLAGS) $(MFLAGS) -fpic -c -o $*.pic.o $< + .c.o: +- @$(MKTOOL) -c -v $(MFLAGS) -c -o $*.o $< ++ @$(MKTOOL) -c -v $(CFLAGS) $(MFLAGS) -c -o $*.o $< + +-install: mktool +- -$(MKTOOL) -i $(ARNAME) $(libdir) +- -$(MKTOOL) -i -libname $(LIBNAME) -libvers $(LIBVERS) $(libdir) ++install: install-ar ++ $(MKTOOL) -i -libname $(LIBNAME) -libvers $(LIBVERS) $(libdir) + $(MKTOOL) -i $(HDRS) $(includedir)/mba + $(MKTOOL) -i docs/man/*.3m.gz $(mandir)/man3 +- @-libdir=$(libdir) mandir="$(mandir)" MAN="$(MAN)" MANGZ="$(MANGZ)" $(MKTOOL) -m -v platform_specific_install + @echo + @echo installation successful +-uninstall: mktool +- $(MKTOOL) -u $(ARNAME) $(libdir) ++uninstall: uninstall-ar + $(MKTOOL) -u -libname $(LIBNAME) -libvers $(LIBVERS) $(libdir) + $(MKTOOL) -u $(HDRS) $(includedir)/mba + rm -rf $(includedir)/mba + $(MKTOOL) -u $(MANGZ) $(mandir)/man3 +- -@libdir=$(libdir) mandir="$(mandir)" MAN="$(MAN)" MANGZ="$(MANGZ)" $(MKTOOL) -m -v platform_specific_uninstall + @echo + @echo de-installation successful + |