[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/files/, dev-libs/ustr/, profiles/
commit: 16766288ecd8207d62a79d39bc66fab5333ed0b0 Author: Michał Górny gentoo org> AuthorDate: Tue Jan 19 08:36:17 2021 + Commit: Michał Górny gentoo org> CommitDate: Tue Jan 19 08:39:07 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16766288 dev-libs/ustr: Remove last-rited pkg Closes: https://bugs.gentoo.org/652192 Signed-off-by: Michał Górny gentoo.org> dev-libs/ustr/Manifest| 1 - dev-libs/ustr/files/ustr-1.0.4-build-libs.patch | 49 - dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch | 28 dev-libs/ustr/files/ustr-1.0.4-inline-check.patch | 27 --- dev-libs/ustr/metadata.xml| 15 dev-libs/ustr/ustr-1.0.4-r8.ebuild| 83 - dev-libs/ustr/ustr-1.0.4-r9.ebuild| 87 --- profiles/package.mask | 5 -- 8 files changed, 295 deletions(-) diff --git a/dev-libs/ustr/Manifest b/dev-libs/ustr/Manifest deleted file mode 100644 index b35cbd28771..000 --- a/dev-libs/ustr/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ustr-1.0.4.tar.bz2 233723 BLAKE2B 47fd489cadda1487eb131b9a21148d4b21ad46320f5177a0f3c2b2e156a5756918e269053363d47608661a47d8969b8c505192edea316edbd9fc17649d8dbc91 SHA512 b7df6ca3a9f25ee6f5c9ab4325732d348de27c5e02ebff36a7d5706f56b2df994df35bd652825a28e27bbde731c6a5933248d99c670d192b1952e7534eec1510 diff --git a/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch b/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch deleted file mode 100644 index 79fe818c8ed..000 --- a/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch +++ /dev/null @@ -1,49 +0,0 @@ -make static lib build/install controllable so we can disable it by default - -punt the -debug lib variants ... if people want debug libs, they can rebuild -the package using their desired build settings. - a/Makefile -+++ b/Makefile -@@ -291,8 +291,10 @@ - OPT_LIB_SHARED = libustr-$(VERS_BSO).so.$(VERS_ESO) - OPT_LIB_STATIC = libustr.a - --LIB_SHARED = $(DBG_LIB_SHARED) $(OPT_LIB_SHARED) --LIB_STATIC = $(DBG_LIB_STATIC) $(OPT_LIB_STATIC) -+LIB_SHARED = $(OPT_LIB_SHARED) -+ifeq ($(USE_STATIC),yes) -+LIB_STATIC = $(OPT_LIB_STATIC) -+endif - - DEPS_NONC_ALL = $(SRC_HDRS) $(SRC_SRCS_H) - DEPS_C_ALL = $(SRC_HDRS) -@@ -388,17 +390,14 @@ - install -d $(DESTDIR)$(bindir) - install -d $(DESTDIR)$(libdir)/pkgconfig - $(HIDE)echo Installing files -+ifeq ($(USE_STATIC),yes) - install -m 644 -t $(DESTDIR)$(libdir) $(LIB_STATIC) -+endif - install -m 755 -t $(DESTDIR)$(libdir) $(LIB_SHARED) - -rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME) - ln -s $(OPT_LIB_SHARED) $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME) - -rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV) - ln -s $(OPT_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV) -- -rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME) -- ln -s $(DBG_LIB_SHARED) $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME) -- -rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV) -- ln -s $(DBG_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV) -- $(LDCONFIG) -n $(DESTDIR)$(libdir) - install -pm 644 -t $(DESTDIR)$(includedir) $(SRC_HDRS) - install -pm 644 -t $(DESTDIR)$(SHRDIR) $(SRC_SRCS) - install -pm 644 -t $(DESTDIR)$(SHRDIR) $(XSRC_SRCS) -@@ -406,7 +406,7 @@ endif - install -pm 644 -t $(DESTDIR)$(mandir)/man1 $(MAN_PAGES_1) - install -pm 644 -t $(DESTDIR)$(mandir)/man3 $(MAN_PAGES_3) - install -m 755 -t $(DESTDIR)$(bindir) ustr-import -- install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc ustr-debug.pc -+ install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc - - ustr-import-multilib: ustr-import-multilib.in - sed -e 's,@INCLUDEDIR@,$(includedir),g' -e 's,@MBINDIR@,$(MBINDIR),g' < $< > $@ diff --git a/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch b/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch deleted file mode 100644 index aaed1503030..000 --- a/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch +++ /dev/null @@ -1,28 +0,0 @@ a/ustr-conf.h.in 2007-10-22 08:00:55.0 +0200 -+++ b/ustr-conf.h.in 2015-09-10 12:24:34.998796842 +0200 -@@ -4,13 +4,24 @@ - /* this is the custom version for the library itself, for everyone else - * ustr-import generates one depending on the options. */ - -+/* If this is GCC with major version 5 and up, the default C standard -+ * has changed from C89 to C99 so the old inline behaviour must be -+ * restored: -+ */ -+#if defined(__GNUC__) \ -+ && (__GNUC__ > 4) \ -+ && defined(__STDC_VERSION__) \ -+ && (__STDC_VERSION__ >= 199901L) -+# define inline inline __attribute__ ((gnu_inline)) -+#endif /* GCC greater
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/
commit: 17ee13c5d051f816b564a7c1bbacb6d30c73562b Author: Aaron Bauman gentoo org> AuthorDate: Fri Nov 13 22:02:38 2020 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Nov 13 22:05:17 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ee13c5 dev-libs/ustr: drop static-libs per QA Signed-off-by: Aaron Bauman gentoo.org> dev-libs/ustr/ustr-1.0.4-r8.ebuild | 4 ++-- dev-libs/ustr/ustr-1.0.4-r9.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild index 6fb52670f3b..e625d492455 100644 --- a/dev-libs/ustr/ustr-1.0.4-r8.ebuild +++ b/dev-libs/ustr/ustr-1.0.4-r8.ebuild @@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"; LICENSE="|| ( BSD-2 MIT LGPL-2 )" SLOT="0" KEYWORDS="amd64 ~arm ~arm64 ~mips x86" -IUSE="static-libs ustr-import" +IUSE="ustr-import" DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO) @@ -29,7 +29,7 @@ src_prepare() { _emake() { emake \ - USE_STATIC=$(usex static-libs) \ + USE_STATIC="no" \ AR="$(tc-getAR)" \ CC="$(tc-getCC)" \ CFLAGS="${CFLAGS} ${CPPFLAGS}" \ diff --git a/dev-libs/ustr/ustr-1.0.4-r9.ebuild b/dev-libs/ustr/ustr-1.0.4-r9.ebuild index c3bbc52d9eb..184372af56b 100644 --- a/dev-libs/ustr/ustr-1.0.4-r9.ebuild +++ b/dev-libs/ustr/ustr-1.0.4-r9.ebuild @@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"; LICENSE="|| ( BSD-2 MIT LGPL-2 )" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" -IUSE="static-libs ustr-import" +IUSE="ustr-import" DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO) @@ -33,7 +33,7 @@ src_prepare() { _emake() { emake \ - USE_STATIC=$(usex static-libs) \ + USE_STATIC="no" \ AR="$(tc-getAR)" \ CC="$(tc-getCC)" \ CFLAGS="${CFLAGS} ${CPPFLAGS}" \
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/
commit: 586064fddf3896883ef78ccc55bd28d5d3fcd006 Author: Sven Eden prydeworx com> AuthorDate: Sat Nov 7 15:23:45 2020 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Nov 13 21:31:15 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=586064fd dev-libs/ustr-1.0.4-r9 : Update to EAPI 7 Signed-off-by: Sven Eden prydeworx.com> Signed-off-by: Aaron Bauman gentoo.org> dev-libs/ustr/ustr-1.0.4-r9.ebuild | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dev-libs/ustr/ustr-1.0.4-r9.ebuild b/dev-libs/ustr/ustr-1.0.4-r9.ebuild index 632e404652a..c3bbc52d9eb 100644 --- a/dev-libs/ustr/ustr-1.0.4-r9.ebuild +++ b/dev-libs/ustr/ustr-1.0.4-r9.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit toolchain-funcs multilib-minimal @@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"; LICENSE="|| ( BSD-2 MIT LGPL-2 )" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~mips x86" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" IUSE="static-libs ustr-import" DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO) @@ -21,9 +21,13 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/ustr-conf-debug.h ) +PATCHES=( + "${FILESDIR}/${P}-inline-check.patch" + "${FILESDIR}/${PN}-1.0.4-build-libs.patch" +) + src_prepare() { - epatch "${FILESDIR}/${P}-inline-check.patch" - epatch "${FILESDIR}/${PN}-1.0.4-build-libs.patch" + default multilib_copy_sources }
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/, dev-libs/ustr/files/
commit: a13790eb155f9c5740fb0c11b56ab2d81dd7f591 Author: Fergus Dall google com> AuthorDate: Thu Sep 24 08:08:39 2020 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Nov 13 21:31:15 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a13790eb dev-libs/ustr: Fix compilation using clang/LLVM This package depends on old-style GCC inline functions, but the patch to maintain this behaviour on newer compilers only works for GCC specifically. Replace this with a check for __GNUC_STDC_INLINE__, which is documented to work with both GCC and clang. Bug: https://bugs.gentoo.org/732026 Closes: https://bugs.gentoo.org/732026 Signed-off-by: Fergus Dall google.com> Signed-off-by: Sven Eden prydeworx.com> Signed-off-by: Aaron Bauman gentoo.org> dev-libs/ustr/files/ustr-1.0.4-inline-check.patch | 27 dev-libs/ustr/ustr-1.0.4-r9.ebuild| 83 +++ 2 files changed, 110 insertions(+) diff --git a/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch b/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch new file mode 100644 index 000..b38cf7829c9 --- /dev/null +++ b/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch @@ -0,0 +1,27 @@ +--- a/ustr-conf.h.in 2007-10-22 08:00:55.0 +0200 b/ustr-conf.h.in 2015-09-10 12:24:34.998796842 +0200 +@@ -4,13 +4,23 @@ + /* this is the custom version for the library itself, for everyone else + * ustr-import generates one depending on the options. */ + ++/* Ustr relies on GCC's traditional handling of inline functions, not ++ * the version that was actually standardized in C99. GCC-compatible ++ * compilers define __GNUC_STDC_INLINE__ when using the standard ++ * behavior. When this is set we must restore the old inline behavior: ++ */ ++#if defined(__GNUC__) \ ++ && defined(__GNUC_STDC_INLINE__) ++# define inline inline __attribute__ ((gnu_inline)) ++#endif ++ + /* The default is now to link against libc. */ + #ifndef USTR_CONF_INCLUDE_CODEONLY_HEADERS + #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 0 + #endif + + /* We can't: if defined(__GLIBC__) && (!defined(_GNU_SOURCE) || !_GNU_SOURCE) +- * because by the time we've included a libc header it's too late. */ ++ * because by the time we've included a libc header it's too late. */ + #ifndef _GNU_SOURCE + #define _GNU_SOURCE 1 + #endif diff --git a/dev-libs/ustr/ustr-1.0.4-r9.ebuild b/dev-libs/ustr/ustr-1.0.4-r9.ebuild new file mode 100644 index 000..632e404652a --- /dev/null +++ b/dev-libs/ustr/ustr-1.0.4-r9.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit toolchain-funcs multilib-minimal + +DESCRIPTION="Low-overhead managed string library for C" +HOMEPAGE="http://www.and.org/ustr/"; +SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"; + +LICENSE="|| ( BSD-2 MIT LGPL-2 )" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~mips x86" +IUSE="static-libs ustr-import" + +DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/ustr-conf.h + /usr/include/ustr-conf-debug.h +) + +src_prepare() { + epatch "${FILESDIR}/${P}-inline-check.patch" + epatch "${FILESDIR}/${PN}-1.0.4-build-libs.patch" + multilib_copy_sources +} + +_emake() { + emake \ + USE_STATIC=$(usex static-libs) \ + AR="$(tc-getAR)" \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS} ${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + prefix="${EPREFIX}/usr" \ + libdir="${EPREFIX}/usr/$(get_libdir)" \ + mandir="${EPREFIX}/usr/share/man" \ + SHRDIR="${EPREFIX}/usr/share/${P}" \ + DOCSHRDIR="${EPREFIX}/usr/share/doc/${PF}" \ + HIDE= \ + "$@" +} + +multilib_src_configure() { + # The included configure tests require execution. + + # We require vsnprintf everywhere as it's in POSIX. + printf '#!/bin/sh\necho 0\n' > autoconf_vsnprintf + chmod a+rx autoconf_vsnprintf + + # Always use stdint.h as it's in POSIX. + sed -i '/have_stdint_h=0/s:=0:=1:' Makefile || die + + # Figure out the size of size_t. + printf '#include \nint main() { char buf[sizeof(size_t) - 8]; }\n' > sizet_test.c +$(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c sizet_test.c 2>/dev/null + printf '#!/bin/sh\necho %s\n' $(( $? == 0 )) > autoconf_64b + chmod a+rx autoconf_64b + + # Generate the config file now to avoid bad makefile deps. + _emake ustr-import +} + +multilib_src_compile() { + _emake all-shared +} + +multilib_src_install() { + _emake DESTDIR="${D}" install + + if ! use ustr-import ; then + rm -r \ + "${ED}/usr/bin/ustr-import" \ + "${ED}/usr/share/man/man1/ustr-import.1" \ + "${ED}/usr/share/
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/
commit: d982d08fb09623387f69df96e8906dfab8d7933a Author: Sven Eden prydeworx com> AuthorDate: Sat Nov 7 15:27:24 2020 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Nov 13 21:31:16 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d982d08f dev-libs/ustr: Drop obsolete ustr-1.0.4-r5.ebuild Signed-off-by: Sven Eden prydeworx.com> Signed-off-by: Aaron Bauman gentoo.org> dev-libs/ustr/ustr-1.0.4-r5.ebuild | 65 -- 1 file changed, 65 deletions(-) diff --git a/dev-libs/ustr/ustr-1.0.4-r5.ebuild b/dev-libs/ustr/ustr-1.0.4-r5.ebuild deleted file mode 100644 index dc3c5bb1983..000 --- a/dev-libs/ustr/ustr-1.0.4-r5.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs multilib-minimal - -DESCRIPTION="Low-overhead managed string library for C" -HOMEPAGE="http://www.and.org/ustr/"; -SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"; - -LICENSE="|| ( BSD-2 MIT LGPL-2 )" -SLOT="0" -KEYWORDS="amd64 ~arm ~mips x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/ustr-conf.h - /usr/include/ustr-conf-debug.h -) - -src_prepare() { - multilib_copy_sources -} - -multilib_src_compile() { - emake \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - prefix="${EPREFIX}/usr" \ - SHRDIR="/usr/share/${P}" \ - HIDE= \ - all-shared -} - -multilib_src_install() { - emake \ - DESTDIR="${D}" \ - prefix="${EPREFIX}/usr" \ - libdir="${EPREFIX}/usr/$(get_libdir)" \ - mandir="/usr/share/man" \ - SHRDIR="/usr/share/${P}" \ - DOCSHRDIR="/usr/share/doc/${PF}" \ - HIDE= \ - install -} - -multilib_src_test() { - emake \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - prefix="${EPREFIX}/usr" \ - SHRDIR="/usr/share/${P}" \ - HIDE= \ - check -}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/
commit: 9c229674248f9a492cf314c76e0d1b7809b21a8c Author: Sven Eden prydeworx com> AuthorDate: Sat Nov 7 15:27:57 2020 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Nov 13 21:31:16 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c229674 dev-libs/ustr: Drop obsolete ustr-1.0.4-r7.ebuild Signed-off-by: Sven Eden prydeworx.com> Closes: https://github.com/gentoo/gentoo/pull/18173 Signed-off-by: Aaron Bauman gentoo.org> dev-libs/ustr/ustr-1.0.4-r7.ebuild | 73 -- 1 file changed, 73 deletions(-) diff --git a/dev-libs/ustr/ustr-1.0.4-r7.ebuild b/dev-libs/ustr/ustr-1.0.4-r7.ebuild deleted file mode 100644 index 0d4f3ece9d8..000 --- a/dev-libs/ustr/ustr-1.0.4-r7.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs multilib-minimal - -DESCRIPTION="Low-overhead managed string library for C" -HOMEPAGE="http://www.and.org/ustr/"; -SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"; - -LICENSE="|| ( BSD-2 MIT LGPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~x86" - -DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/ustr-conf.h - /usr/include/ustr-conf-debug.h -) - -src_prepare() { - epatch "${FILESDIR}/${P}-gcc_5-check.patch" - multilib_copy_sources -} - -_emake() { - emake \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS} ${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - prefix="${EPREFIX}/usr" \ - libdir="${EPREFIX}/usr/$(get_libdir)" \ - mandir="${EPREFIX}/usr/share/man" \ - SHRDIR="${EPREFIX}/usr/share/${P}" \ - DOCSHRDIR="${EPREFIX}/usr/share/doc/${PF}" \ - HIDE= \ - "$@" -} - -multilib_src_configure() { - # The included configure tests require execution. - - # We require vsnprintf everywhere as it's in POSIX. - printf '#!/bin/sh\necho 0\n' > autoconf_vsnprintf - chmod a+rx autoconf_vsnprintf - - # Always use stdint.h as it's in POSIX. - sed -i '/have_stdint_h=0/s:=0:=1:' Makefile || die - - # Figure out the size of size_t. - printf '#include \nint main() { char buf[sizeof(size_t) - 8]; }\n' > sizet_test.c -$(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c sizet_test.c 2>/dev/null - printf '#!/bin/sh\necho %s\n' $(( $? == 0 )) > autoconf_64b - chmod a+rx autoconf_64b - - # Generate the config file now to avoid bad makefile deps. - _emake ustr-import -} - -multilib_src_compile() { - _emake all-shared -} - -multilib_src_install() { - _emake DESTDIR="${D}" install -} - -multilib_src_test() { - _emake check -}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/
commit: 3acf9f2b38948a2c5a58ec38e99e639448e8f48d Author: Sven Eden prydeworx com> AuthorDate: Sat Nov 7 15:25:39 2020 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Nov 13 21:31:15 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3acf9f2b dev-libs/ustr: Claim maintainership Signed-off-by: Sven Eden prydeworx.com> Signed-off-by: Aaron Bauman gentoo.org> dev-libs/ustr/metadata.xml | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml index 0fb02e2df52..97b72ca3a65 100644 --- a/dev-libs/ustr/metadata.xml +++ b/dev-libs/ustr/metadata.xml @@ -1,7 +1,14 @@ http://www.gentoo.org/dtd/metadata.dtd";> - + + sven.e...@prydeworx.com + Sven Eden + + + proxy-ma...@gentoo.org + Proxy Maintainers + Install ustr-import developer program and source code for bundling.
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/
commit: 90d1890857bab5bf7b3351aa3ceb3c562d5c64c8 Author: Jonas Stein gentoo org> AuthorDate: Mon Aug 24 17:38:17 2020 + Commit: Jonas Stein gentoo org> CommitDate: Mon Aug 24 17:45:03 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90d18908 dev-libs/ustr: Maintainer retired Proxied maintainer retired due to inactivity. Bug: https://bugs.gentoo.org/633138 Package-Manager: Portage-3.0.4, Repoman-2.3.23 Signed-off-by: Jonas Stein gentoo.org> dev-libs/ustr/metadata.xml | 9 + 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml index 36a48162dc5..0fb02e2df52 100644 --- a/dev-libs/ustr/metadata.xml +++ b/dev-libs/ustr/metadata.xml @@ -1,14 +1,7 @@ http://www.gentoo.org/dtd/metadata.dtd";> - - yamakuz...@gmx.net - Sven Eden - - - proxy-ma...@gentoo.org - Proxy Maintainers - + Install ustr-import developer program and source code for bundling.
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/
commit: f46457ffc29617006755a8480107e845065e5e3f Author: Jonas Stein gentoo org> AuthorDate: Mon Apr 2 10:24:35 2018 + Commit: Jonas Stein gentoo org> CommitDate: Mon Apr 2 10:25:00 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f46457ff dev-libs/ustr: Fix HOMEPAGE redirect Package-Manager: Portage-2.3.27, Repoman-2.3.9 dev-libs/ustr/ustr-1.0.4-r5.ebuild | 4 ++-- dev-libs/ustr/ustr-1.0.4-r7.ebuild | 4 ++-- dev-libs/ustr/ustr-1.0.4-r8.ebuild | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dev-libs/ustr/ustr-1.0.4-r5.ebuild b/dev-libs/ustr/ustr-1.0.4-r5.ebuild index 65f80d28750..dc3c5bb1983 100644 --- a/dev-libs/ustr/ustr-1.0.4-r5.ebuild +++ b/dev-libs/ustr/ustr-1.0.4-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -6,7 +6,7 @@ EAPI=5 inherit toolchain-funcs multilib-minimal DESCRIPTION="Low-overhead managed string library for C" -HOMEPAGE="http://www.and.org/ustr"; +HOMEPAGE="http://www.and.org/ustr/"; SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"; LICENSE="|| ( BSD-2 MIT LGPL-2 )" diff --git a/dev-libs/ustr/ustr-1.0.4-r7.ebuild b/dev-libs/ustr/ustr-1.0.4-r7.ebuild index 2219f889229..0d4f3ece9d8 100644 --- a/dev-libs/ustr/ustr-1.0.4-r7.ebuild +++ b/dev-libs/ustr/ustr-1.0.4-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -6,7 +6,7 @@ EAPI=5 inherit toolchain-funcs multilib-minimal DESCRIPTION="Low-overhead managed string library for C" -HOMEPAGE="http://www.and.org/ustr"; +HOMEPAGE="http://www.and.org/ustr/"; SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"; LICENSE="|| ( BSD-2 MIT LGPL-2 )" diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild index 0a00eb5d697..6fb52670f3b 100644 --- a/dev-libs/ustr/ustr-1.0.4-r8.ebuild +++ b/dev-libs/ustr/ustr-1.0.4-r8.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=5 inherit toolchain-funcs multilib-minimal DESCRIPTION="Low-overhead managed string library for C" -HOMEPAGE="http://www.and.org/ustr"; +HOMEPAGE="http://www.and.org/ustr/"; SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"; LICENSE="|| ( BSD-2 MIT LGPL-2 )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/
commit: 71c84386809001073561c17f49f884a248742558 Author: Jonas Stein gentoo org> AuthorDate: Mon Apr 2 10:08:16 2018 + Commit: Jonas Stein gentoo org> CommitDate: Mon Apr 2 10:24:59 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c84386 dev-libs/ustr: unified contact mail Use same string for mail in all packages now. Package-Manager: Portage-2.3.27, Repoman-2.3.9 dev-libs/ustr/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml index b4a7d9f661c..36a48162dc5 100644 --- a/dev-libs/ustr/metadata.xml +++ b/dev-libs/ustr/metadata.xml @@ -2,7 +2,7 @@ http://www.gentoo.org/dtd/metadata.dtd";> - yamakuz...@gmx.net + yamakuz...@gmx.net Sven Eden
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/
commit: 0e050884ef6b7b3f707b237ff2576e4c56c441a9 Author: Michał Górny gentoo org> AuthorDate: Sun Feb 11 10:31:17 2018 + Commit: Michał Górny gentoo org> CommitDate: Sun Feb 11 10:34:17 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e050884 dev-libs/ustr: Remove useless maintainer Remove useless/redundant maintainer . It does not benefit bug wrangling, and only wastes developer's time on reading it. Few tips: - assignee/CC is implied by ordering, there is no reason to repeat it, - we know that maintainer is maintainer (la la la la la), - most of adjectives for maintainer are of no value and/or are obvious. dev-libs/ustr/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml index 524aa433671..b4a7d9f661c 100644 --- a/dev-libs/ustr/metadata.xml +++ b/dev-libs/ustr/metadata.xml @@ -4,7 +4,6 @@ yamakuz...@gmx.net Sven Eden - Maintainer. Assign bugs to him proxy-ma...@gentoo.org
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/
commit: af515bdd463b0a5c983e3202a3852839c5d875c7 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Jun 10 13:53:27 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Jun 10 13:53:27 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af515bdd dev-libs/ustr: amd64 stable wrt bug #584758 Package-Manager: portage-2.2.28 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-libs/ustr/ustr-1.0.4-r8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild index 784d946..920b3d0 100644 --- a/dev-libs/ustr/ustr-1.0.4-r8.ebuild +++ b/dev-libs/ustr/ustr-1.0.4-r8.ebuild @@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"; LICENSE="|| ( BSD-2 MIT LGPL-2 )" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~mips ~x86" IUSE="static-libs ustr-import" DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/, dev-libs/ustr/files/
commit: 2d365dd353b15bf43b65049f4f9056f379607200 Author: Mike Frysinger gentoo org> AuthorDate: Wed Feb 17 18:31:53 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Wed Feb 17 18:42:26 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d365dd3 dev-libs/ustr: make installed file set more minimal Add USE=static-libs to control install of the static archive. Add USE=ustr-import to control install of the dev tool and source tree. Punt the xxx-debug libs as this isn't how we handle debugging in Gentoo. dev-libs/ustr/files/ustr-1.0.4-build-libs.patch | 49 +++ dev-libs/ustr/metadata.xml | 3 + dev-libs/ustr/ustr-1.0.4-r8.ebuild | 84 + 3 files changed, 136 insertions(+) diff --git a/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch b/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch new file mode 100644 index 000..79fe818 --- /dev/null +++ b/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch @@ -0,0 +1,49 @@ +make static lib build/install controllable so we can disable it by default + +punt the -debug lib variants ... if people want debug libs, they can rebuild +the package using their desired build settings. + +--- a/Makefile b/Makefile +@@ -291,8 +291,10 @@ + OPT_LIB_SHARED = libustr-$(VERS_BSO).so.$(VERS_ESO) + OPT_LIB_STATIC = libustr.a + +-LIB_SHARED = $(DBG_LIB_SHARED) $(OPT_LIB_SHARED) +-LIB_STATIC = $(DBG_LIB_STATIC) $(OPT_LIB_STATIC) ++LIB_SHARED = $(OPT_LIB_SHARED) ++ifeq ($(USE_STATIC),yes) ++LIB_STATIC = $(OPT_LIB_STATIC) ++endif + + DEPS_NONC_ALL = $(SRC_HDRS) $(SRC_SRCS_H) + DEPS_C_ALL = $(SRC_HDRS) +@@ -388,17 +390,14 @@ + install -d $(DESTDIR)$(bindir) + install -d $(DESTDIR)$(libdir)/pkgconfig + $(HIDE)echo Installing files ++ifeq ($(USE_STATIC),yes) + install -m 644 -t $(DESTDIR)$(libdir) $(LIB_STATIC) ++endif + install -m 755 -t $(DESTDIR)$(libdir) $(LIB_SHARED) + -rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME) + ln -s $(OPT_LIB_SHARED) $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME) + -rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV) + ln -s $(OPT_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV) +- -rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME) +- ln -s $(DBG_LIB_SHARED) $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME) +- -rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV) +- ln -s $(DBG_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV) +- $(LDCONFIG) -n $(DESTDIR)$(libdir) + install -pm 644 -t $(DESTDIR)$(includedir) $(SRC_HDRS) + install -pm 644 -t $(DESTDIR)$(SHRDIR) $(SRC_SRCS) + install -pm 644 -t $(DESTDIR)$(SHRDIR) $(XSRC_SRCS) +@@ -406,7 +406,7 @@ endif + install -pm 644 -t $(DESTDIR)$(mandir)/man1 $(MAN_PAGES_1) + install -pm 644 -t $(DESTDIR)$(mandir)/man3 $(MAN_PAGES_3) + install -m 755 -t $(DESTDIR)$(bindir) ustr-import +- install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc ustr-debug.pc ++ install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc + + ustr-import-multilib: ustr-import-multilib.in + sed -e 's,@INCLUDEDIR@,$(includedir),g' -e 's,@MBINDIR@,$(MBINDIR),g' < $< > $@ diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml index 3d12db6..524aa43 100644 --- a/dev-libs/ustr/metadata.xml +++ b/dev-libs/ustr/metadata.xml @@ -10,4 +10,7 @@ proxy-ma...@gentoo.org Proxy Maintainers + + Install ustr-import developer program and source code for bundling. + diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild new file mode 100644 index 000..a540dad --- /dev/null +++ b/dev-libs/ustr/ustr-1.0.4-r8.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit toolchain-funcs multilib-minimal + +DESCRIPTION="Low-overhead managed string library for C" +HOMEPAGE="http://www.and.org/ustr"; +SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"; + +LICENSE="|| ( BSD-2 MIT LGPL-2 )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~mips ~x86" +IUSE="static-libs ustr-import" + +DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/ustr-conf.h + /usr/include/ustr-conf-debug.h +) + +src_prepare() { + epatch "${FILESDIR}/${P}-gcc_5-check.patch" + epatch "${FILESDIR}/${PN}-1.0.4-build-libs.patch" + multilib_copy_sources +} + +_emake() { + emake \ + USE_STATIC=$(usex static-libs) \ + AR="$(tc-getAR)" \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS} ${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + prefix="
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/
commit: a18c23fc46121edde7c4314bdf6a49b67daf424e Author: Mike Frysinger gentoo org> AuthorDate: Wed Feb 17 18:13:16 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Wed Feb 17 18:42:26 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18c23fc dev-libs/ustr: unify emake calls Also fix $EPREFIX usage in more paths, and respect CPPFLAGS settings. dev-libs/ustr/ustr-1.0.4-r7.ebuild | 35 +-- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/dev-libs/ustr/ustr-1.0.4-r7.ebuild b/dev-libs/ustr/ustr-1.0.4-r7.ebuild index d898008..eaf650b 100644 --- a/dev-libs/ustr/ustr-1.0.4-r7.ebuild +++ b/dev-libs/ustr/ustr-1.0.4-r7.ebuild @@ -26,38 +26,29 @@ src_prepare() { multilib_copy_sources } -multilib_src_compile() { +_emake() { emake \ AR="$(tc-getAR)" \ CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ + CFLAGS="${CFLAGS} ${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" \ prefix="${EPREFIX}/usr" \ - SHRDIR="/usr/share/${P}" \ + libdir="${EPREFIX}/usr/$(get_libdir)" \ + mandir="${EPREFIX}/usr/share/man" \ + SHRDIR="${EPREFIX}/usr/share/${P}" \ + DOCSHRDIR="${EPREFIX}/usr/share/doc/${PF}" \ HIDE= \ - all-shared + "$@" +} + +multilib_src_compile() { + _emake all-shared } multilib_src_install() { - emake \ - DESTDIR="${D}" \ - prefix="${EPREFIX}/usr" \ - libdir="${EPREFIX}/usr/$(get_libdir)" \ - mandir="/usr/share/man" \ - SHRDIR="/usr/share/${P}" \ - DOCSHRDIR="/usr/share/doc/${PF}" \ - HIDE= \ - install + _emake DESTDIR="${D}" install } multilib_src_test() { - emake \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - prefix="${EPREFIX}/usr" \ - SHRDIR="/usr/share/${P}" \ - HIDE= \ - check + _emake check }
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/
commit: df0e7ecbea811f1c0274244b1e27efd97d463404 Author: Mike Frysinger gentoo org> AuthorDate: Wed Feb 17 18:40:27 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Wed Feb 17 18:42:26 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df0e7ecb dev-libs/ustr: add arm64 love dev-libs/ustr/ustr-1.0.4-r8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild index a540dad..784d946 100644 --- a/dev-libs/ustr/ustr-1.0.4-r8.ebuild +++ b/dev-libs/ustr/ustr-1.0.4-r8.ebuild @@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"; LICENSE="|| ( BSD-2 MIT LGPL-2 )" SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" IUSE="static-libs ustr-import" DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/
commit: c2d28f8122e1b55523aa94e657d05ee1be89fcfb Author: Mike Frysinger gentoo org> AuthorDate: Wed Feb 17 18:21:04 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Wed Feb 17 18:42:26 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2d28f81 dev-libs/ustr: add a configure stage for cross-compiling The build system likes to compile & run programs to figure out host features. This fails when cross-compiling and such, so add a func to do all with compile tests. dev-libs/ustr/ustr-1.0.4-r7.ebuild | 20 1 file changed, 20 insertions(+) diff --git a/dev-libs/ustr/ustr-1.0.4-r7.ebuild b/dev-libs/ustr/ustr-1.0.4-r7.ebuild index eaf650b..0c7387c 100644 --- a/dev-libs/ustr/ustr-1.0.4-r7.ebuild +++ b/dev-libs/ustr/ustr-1.0.4-r7.ebuild @@ -41,6 +41,26 @@ _emake() { "$@" } +multilib_src_configure() { + # The included configure tests require execution. + + # We require vsnprintf everywhere as it's in POSIX. + printf '#!/bin/sh\necho 0\n' > autoconf_vsnprintf + chmod a+rx autoconf_vsnprintf + + # Always use stdint.h as it's in POSIX. + sed -i '/have_stdint_h=0/s:=0:=1:' Makefile || die + + # Figure out the size of size_t. + printf '#include \nint main() { char buf[sizeof(size_t) - 8]; }\n' > sizet_test.c +$(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c sizet_test.c 2>/dev/null + printf '#!/bin/sh\necho %s\n' $(( $? == 0 )) > autoconf_64b + chmod a+rx autoconf_64b + + # Generate the config file now to avoid bad makefile deps. + _emake ustr-import +} + multilib_src_compile() { _emake all-shared }
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/
commit: a6538bd29209681140f0e7d5f4844f2513287e5c Author: Ian Delaney gentoo org> AuthorDate: Tue Sep 15 06:25:37 2015 + Commit: Ian Delaney gentoo org> CommitDate: Tue Sep 15 06:27:42 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6538bd2 dev-libs/ustr: revbump ustr-1.0.4-r7.ebuild made from base of ustr-1.0.4-r5.ebuild with changes from Bug #556452 correcting patch submitted by user which added changes to the stabled ustr-1.0.4-r5 as the base, removed the brokenustr-1.0.4-r6 ebuild, ack to Arfrever for reporting and providing support to make ustr-1.0.4-r7. Package-Manager: portage-2.2.20.1 .../{ustr-1.0.4-r6.ebuild => ustr-1.0.4-r7.ebuild} | 50 +++--- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/dev-libs/ustr/ustr-1.0.4-r6.ebuild b/dev-libs/ustr/ustr-1.0.4-r7.ebuild similarity index 56% rename from dev-libs/ustr/ustr-1.0.4-r6.ebuild rename to dev-libs/ustr/ustr-1.0.4-r7.ebuild index 249168b..d898008 100644 --- a/dev-libs/ustr/ustr-1.0.4-r6.ebuild +++ b/dev-libs/ustr/ustr-1.0.4-r7.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/ustr/ustr-1.0.4-r3.ebuild,v 1.4 2014/01/14 13:58:01 ago Exp $ +# $Id$ EAPI=5 -inherit multilib-build toolchain-funcs eutils +inherit toolchain-funcs multilib-minimal DESCRIPTION="Low-overhead managed string library for C" HOMEPAGE="http://www.and.org/ustr"; @@ -13,49 +13,51 @@ SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"; LICENSE="|| ( BSD-2 MIT LGPL-2 )" SLOT="0" KEYWORDS="~amd64 ~arm ~mips ~x86" -IUSE="" -DEPEND="" -RDEPEND="" +DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/ustr-conf.h + /usr/include/ustr-conf-debug.h +) src_prepare() { epatch "${FILESDIR}/${P}-gcc_5-check.patch" multilib_copy_sources } -ustr_make() { - emake "$@" \ +multilib_src_compile() { + emake \ AR="$(tc-getAR)" \ CC="$(tc-getCC)" \ CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS}" \ prefix="${EPREFIX}/usr" \ SHRDIR="/usr/share/${P}" \ - HIDE= || die + HIDE= \ + all-shared } -ustr_install() { - cd "${BUILD_DIR}" || die - - emake "$@" \ +multilib_src_install() { + emake \ DESTDIR="${D}" \ prefix="${EPREFIX}/usr" \ libdir="${EPREFIX}/usr/$(get_libdir)" \ mandir="/usr/share/man" \ SHRDIR="/usr/share/${P}" \ DOCSHRDIR="/usr/share/doc/${PF}" \ - HIDE= || die -} - -src_compile() { - multilib_foreach_abi ustr_make all-shared + HIDE= \ + install } multilib_src_test() { - multilib_foreach_abi ustr_make check -} - -src_install() { - multilib_foreach_abi ustr_install install-multilib-linux - dodoc ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO + emake \ + AR="$(tc-getAR)" \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + prefix="${EPREFIX}/usr" \ + SHRDIR="/usr/share/${P}" \ + HIDE= \ + check }
[gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/, dev-libs/ustr/files/
commit: 7dea6f8820f36bf389e6315044bea7507553bed0 Author: Ian Delaney gentoo org> AuthorDate: Sun Sep 13 03:14:45 2015 + Commit: Ian Delaney gentoo org> CommitDate: Sun Sep 13 03:14:45 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dea6f88 dev-libs/ustr: revbump; patch and ebuild submitted in bug #556452 Package-Manager: portage-2.2.20.1 dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch | 28 +++ dev-libs/ustr/ustr-1.0.4-r6.ebuild | 61 2 files changed, 89 insertions(+) diff --git a/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch b/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch new file mode 100644 index 000..aaed150 --- /dev/null +++ b/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch @@ -0,0 +1,28 @@ +--- a/ustr-conf.h.in 2007-10-22 08:00:55.0 +0200 b/ustr-conf.h.in 2015-09-10 12:24:34.998796842 +0200 +@@ -4,13 +4,24 @@ + /* this is the custom version for the library itself, for everyone else + * ustr-import generates one depending on the options. */ + ++/* If this is GCC with major version 5 and up, the default C standard ++ * has changed from C89 to C99 so the old inline behaviour must be ++ * restored: ++ */ ++#if defined(__GNUC__) \ ++ && (__GNUC__ > 4) \ ++ && defined(__STDC_VERSION__) \ ++ && (__STDC_VERSION__ >= 199901L) ++# define inline inline __attribute__ ((gnu_inline)) ++#endif /* GCC greater than major version 4 and not -std=c89 set */ ++ + /* The default is now to link against libc. */ + #ifndef USTR_CONF_INCLUDE_CODEONLY_HEADERS + #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 0 + #endif + + /* We can't: if defined(__GLIBC__) && (!defined(_GNU_SOURCE) || !_GNU_SOURCE) +- * because by the time we've included a libc header it's too late. */ ++ * because by the time we've included a libc header it's too late. */ + #ifndef _GNU_SOURCE + #define _GNU_SOURCE 1 + #endif diff --git a/dev-libs/ustr/ustr-1.0.4-r6.ebuild b/dev-libs/ustr/ustr-1.0.4-r6.ebuild new file mode 100644 index 000..249168b --- /dev/null +++ b/dev-libs/ustr/ustr-1.0.4-r6.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/ustr/ustr-1.0.4-r3.ebuild,v 1.4 2014/01/14 13:58:01 ago Exp $ + +EAPI=5 + +inherit multilib-build toolchain-funcs eutils + +DESCRIPTION="Low-overhead managed string library for C" +HOMEPAGE="http://www.and.org/ustr"; +SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"; + +LICENSE="|| ( BSD-2 MIT LGPL-2 )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~mips ~x86" +IUSE="" + +DEPEND="" +RDEPEND="" + +src_prepare() { + epatch "${FILESDIR}/${P}-gcc_5-check.patch" + multilib_copy_sources +} + +ustr_make() { + emake "$@" \ + AR="$(tc-getAR)" \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + prefix="${EPREFIX}/usr" \ + SHRDIR="/usr/share/${P}" \ + HIDE= || die +} + +ustr_install() { + cd "${BUILD_DIR}" || die + + emake "$@" \ + DESTDIR="${D}" \ + prefix="${EPREFIX}/usr" \ + libdir="${EPREFIX}/usr/$(get_libdir)" \ + mandir="/usr/share/man" \ + SHRDIR="/usr/share/${P}" \ + DOCSHRDIR="/usr/share/doc/${PF}" \ + HIDE= || die +} + +src_compile() { + multilib_foreach_abi ustr_make all-shared +} + +multilib_src_test() { + multilib_foreach_abi ustr_make check +} + +src_install() { + multilib_foreach_abi ustr_install install-multilib-linux + dodoc ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO +}