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 | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/libmba')
-rw-r--r-- | dev-libs/libmba/Manifest | 5 | ||||
-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 | ||||
-rw-r--r-- | dev-libs/libmba/libmba-0.9.1-r3.ebuild | 40 | ||||
-rw-r--r-- | dev-libs/libmba/metadata.xml | 5 |
5 files changed, 180 insertions, 0 deletions
diff --git a/dev-libs/libmba/Manifest b/dev-libs/libmba/Manifest new file mode 100644 index 000000000000..ee8938e87194 --- /dev/null +++ b/dev-libs/libmba/Manifest @@ -0,0 +1,5 @@ +AUX libmba-0.9.1-glibc-2.20.patch 1039 BLAKE2B 6c458c43a164d2cf438329bbac156d9b41117d1781a2d92b998c0a8d1ac866d7a9a0822b27ffef7610bcc3776c6e054bf333339241ccbd0ca956d373b376bf3a SHA512 b0d0ea1425dd4dbba685eee62609f0627c4d8a579a566d52d1c7f333a92109cf700faaba8ed0f0697d08409feb14ceb5bebf9a799c23e9de1aef388ba1ba4b95 +AUX libmba-0.9.1-qa.patch 2927 BLAKE2B c6b6e364ee2d3eb6026574e2b9a9cb0367da714d06b44a9e0fd8429757d85a42d850634ec3e96d31db47942dd182932d0d5fc6c4b552c552fdc7b3ac11dea984 SHA512 b5886f89c4ea4739e6bfe34e9f8026946ffbbc619922cbd25bab0d7c5df3fefbaf1f198f1321feaf5bbffa79951c58b329cf1d47f4f7ee0f3014de4434c179ea +DIST libmba-0.9.1.tar.gz 290080 BLAKE2B b46890229c1cb1c0e6a2f7c41234f46fb2e590316182944c0850d0fad098c968a738bec434dd82b3c1d831694ba9fc99719f525d83a2bae645ee0ffecc8619c9 SHA512 28696e6066cb6c54434e1a35576c1e2430e3b83a478fddeabb20ddf1d8b889edac023de15090762fb95a759ebb9d2d8fcf1b0d19ec22f6a98ef2780400456da6 +EBUILD libmba-0.9.1-r3.ebuild 903 BLAKE2B dfdd4985491671d7c7bbff571d56e2b794d8516260368cd6f87aa334219b41e24a2870ba29c956f643a698f7f97dd19a8b5887ac421be10c2707e6441fd9d622 SHA512 aed294ada81eebf9bda981a0b09bf82a1f419f8358d7a299e95d6d0b8f5b52a97ee313e0d85d978b535dec10e40a484a610055be475638a55ad51dbdcd29ba6c +MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 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 + diff --git a/dev-libs/libmba/libmba-0.9.1-r3.ebuild b/dev-libs/libmba/libmba-0.9.1-r3.ebuild new file mode 100644 index 000000000000..9f66be909a62 --- /dev/null +++ b/dev-libs/libmba/libmba-0.9.1-r3.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils flag-o-matic multilib toolchain-funcs + +DESCRIPTION="A library of generic C modules" +LICENSE="MIT" +HOMEPAGE="http://www.ioplex.com/~miallen/libmba/" +SRC_URI="${HOMEPAGE}dl/${P}.tar.gz" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="static-libs" + +src_prepare() { + use static-libs && export STATIC="1" + + epatch "${FILESDIR}"/${P}-qa.patch + epatch "${FILESDIR}"/${P}-glibc-2.20.patch + + tc-export CC + sed -i -e "s:gcc:${CC}:g" mktool.c || die + + # prevent reinventing strdup(), wcsdup() and strnlen() + append-cflags -D_XOPEN_SOURCE=500 +} + +src_compile() { + emake LIBDIR="$(get_libdir)" +} + +src_install() { + emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install + + dodoc README.txt docs/*.txt + dohtml -r docs/*.html docs/www/* docs/ref + + insinto /usr/share/doc/${PF}/examples + doins examples/* +} diff --git a/dev-libs/libmba/metadata.xml b/dev-libs/libmba/metadata.xml new file mode 100644 index 000000000000..6f49eba8f496 --- /dev/null +++ b/dev-libs/libmba/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<!-- maintainer-needed --> +</pkgmetadata> |