From d7f374442f81f4cb8bb64904c22a6d8e7ab4c31c Mon Sep 17 00:00:00 2001 From: Simon Que Date: Fri, 4 Jan 2013 12:35:23 -0800 Subject: [PATCH] smatch: upgraded package to upstream Upgraded sys-devel/smatch to version 1.57-r1 on amd64 BUG=chromium-os:37416 TEST="sudo emerge smatch" in chroot Change-Id: I16a3e029ca900c63936385ab5ac0ad664a5252ba Reviewed-on: https://gerrit.chromium.org/gerrit/40459 Reviewed-by: Mike Frysinger Tested-by: Simon Que Commit-Queue: Simon Que --- .../sys-devel/{smatch-1.57 => smatch-1.57-r1} | 4 ++-- .../smatch/files/smatch-1.57-restrict.patch | 14 ++++++++++++++ .../{smatch-1.57.ebuild => smatch-1.57-r1.ebuild} | 7 ++++--- 3 files changed, 20 insertions(+), 5 deletions(-) rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/{smatch-1.57 => smatch-1.57-r1} (53%) create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/smatch/files/smatch-1.57-restrict.patch rename sdk_container/src/third_party/portage-stable/sys-devel/smatch/{smatch-1.57.ebuild => smatch-1.57-r1.ebuild} (82%) diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/smatch-1.57 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/smatch-1.57-r1 similarity index 53% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/smatch-1.57 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/smatch-1.57-r1 index 393adc3942..1bfb93a275 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/smatch-1.57 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/smatch-1.57-r1 @@ -8,5 +8,5 @@ LICENSE=OSL-1.1 RDEPEND=dev-db/sqlite SLOT=0 SRC_URI=mirror://gentoo/smatch-1.57.tar.gz -_eclasses_=multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 -_md5_=41f4cff63e0f1f24e7e040fe095ffce2 +_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29 +_md5_=7b53578cb48f4d8ab7d2e2e5d7ba142d diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/smatch/files/smatch-1.57-restrict.patch b/sdk_container/src/third_party/portage-stable/sys-devel/smatch/files/smatch-1.57-restrict.patch new file mode 100644 index 0000000000..2f0dc98d49 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/smatch/files/smatch-1.57-restrict.patch @@ -0,0 +1,14 @@ +send upstream already + +diff --git a/parse.c b/parse.c +index 5dd9a06..bf5894d 100644 +--- a/parse.c ++++ b/parse.c +@@ -419,6 +419,7 @@ static struct init_keyword { + /* Ignored for now.. */ + { "restrict", NS_TYPEDEF, .op = &restrict_op}, + { "__restrict", NS_TYPEDEF, .op = &restrict_op}, ++ { "__restrict__", NS_TYPEDEF, .op = &restrict_op}, + + /* Storage class */ + { "auto", NS_TYPEDEF, .op = &auto_op }, diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/smatch/smatch-1.57.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/smatch/smatch-1.57-r1.ebuild similarity index 82% rename from sdk_container/src/third_party/portage-stable/sys-devel/smatch/smatch-1.57.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/smatch/smatch-1.57-r1.ebuild index 75136832dd..8b5ac58b6b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/smatch/smatch-1.57.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/smatch/smatch-1.57-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/smatch/smatch-1.57.ebuild,v 1.1 2012/12/20 02:46:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/smatch/smatch-1.57-r1.ebuild,v 1.1 2013/01/03 20:50:43 vapier Exp $ EAPI="4" -inherit multilib toolchain-funcs +inherit multilib toolchain-funcs eutils if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://repo.or.cz/${PN}.git http://repo.or.cz/r/${PN}.git" @@ -35,6 +35,7 @@ DEPEND="${RDEPEND}" S=${WORKDIR}/${PN} src_prepare() { + epatch "${FILESDIR}"/${P}-restrict.patch sed -i \ -e '/^PREFIX=/s:=.*:=/usr:' \ -e '/^CFLAGS =/{s:=:+=:;s:-O2 -finline-functions:${CPPFLAGS}:}' \