From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EFD5F1384AD for ; Sun, 13 Sep 2015 03:15:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C27DE0853; Sun, 13 Sep 2015 03:15:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B950CE0853 for ; Sun, 13 Sep 2015 03:15:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 552DC340AE1 for ; Sun, 13 Sep 2015 03:15:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C644208 for ; Sun, 13 Sep 2015 03:15:34 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1442114085.7dea6f8820f36bf389e6315044bea7507553bed0.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/ustr/, dev-libs/ustr/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch dev-libs/ustr/ustr-1.0.4-r6.ebuild X-VCS-Directories: dev-libs/ustr/files/ dev-libs/ustr/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: 7dea6f8820f36bf389e6315044bea7507553bed0 X-VCS-Branch: master Date: Sun, 13 Sep 2015 03:15:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4efe5a89-63a5-44ff-bbe7-e34817bdf092 X-Archives-Hash: b3de2626e2a5fd9acf2de4d33600481b commit: 7dea6f8820f36bf389e6315044bea7507553bed0 Author: Ian Delaney gentoo org> AuthorDate: Sun Sep 13 03:14:45 2015 +0000 Commit: Ian Delaney gentoo org> CommitDate: Sun Sep 13 03:14:45 2015 +0000 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 0000000..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.000000000 +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 0000000..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 +}