diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-02-15 16:58:00 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-02-15 16:58:00 +0000 |
commit | 434d713861b70f6c6563d6ee50a8e64f14c970d9 (patch) | |
tree | b72c523c72e764420f835ba9d63d43ffef687dcf /sys-devel/sparse | |
parent | f78108598211053d41752a83e0345441bb9014ae (diff) |
gentoo resync : 15.02.2018
Diffstat (limited to 'sys-devel/sparse')
-rw-r--r-- | sys-devel/sparse/Manifest | 14 | ||||
-rw-r--r-- | sys-devel/sparse/files/sparse-0.4.3-gentoo.patch | 49 | ||||
-rw-r--r-- | sys-devel/sparse/files/sparse-0.5.1-cmdline-include.patch | 66 | ||||
-rw-r--r-- | sys-devel/sparse/metadata.xml | 4 | ||||
-rw-r--r-- | sys-devel/sparse/sparse-0.4.3.ebuild | 64 | ||||
-rw-r--r-- | sys-devel/sparse/sparse-0.4.4.ebuild | 46 | ||||
-rw-r--r-- | sys-devel/sparse/sparse-0.5.1.ebuild (renamed from sys-devel/sparse/sparse-0.5.0.ebuild) | 22 | ||||
-rw-r--r-- | sys-devel/sparse/sparse-9999.ebuild | 22 |
8 files changed, 97 insertions, 190 deletions
diff --git a/sys-devel/sparse/Manifest b/sys-devel/sparse/Manifest index 970882008ac9..0af735bc7ba3 100644 --- a/sys-devel/sparse/Manifest +++ b/sys-devel/sparse/Manifest @@ -1,9 +1,5 @@ -AUX sparse-0.4.3-gentoo.patch 1446 BLAKE2B 432086bedcb87765f350abcfa367aec73193d27034915372667845e8d3d4bf16187f20e8b0a6f61d31f7ceab6fae5604d975fbf84fb320fd55258e958b86dc8e SHA512 a270266af0ce1728b114092271e627f63f8e55339b06c67634825a7c89a7cf7e1af17cdd47b5dab7475ef7eca39b95026264c870dee2c3a228c63af0bbdec461 -DIST sparse-0.4.3.tar.bz2 172431 BLAKE2B 06864e372e676a5f0426612774f1df2d224e8e6a12b8f7edf7056225b19725e876196c12e4c92a9a2b64eb410c8a840f777b4df2ffb9945079f4903562fb0633 SHA512 ff3dbd3e28b1a95dc9d6abf9a4ffdfaa0f470047b8232bd50930839432ae66a2249adb861c880e8eef1a906b007fd7d1c1ef8683c48c763eb523aedc9e1df631 -DIST sparse-0.4.4.tar.bz2 174074 BLAKE2B d57c5ec6f837ef1fa8992b5ec21f467583888d9ac3b7699a73e6b8fa80046253cdc554a4c685c2d98474a18fee6fca26fa004d3afa74b18c8f58b05a2900d589 SHA512 5cd5e660ea863170e86f1abaa040434c43a5cc7e92560f1bcbcce9ce906ae7355c066168bfc1dcc551e41e4c0f864122be288ed69eb1c4cda8b7c0825b5b647f -DIST sparse-0.5.0.tar.xz 187576 BLAKE2B c525ce2a11143cd2dbeaff3e8cb1eb66b1792a678946ce001f76ac9882cd54cce4d4c5ff740c12e0e54ca91a6a2dc57bc7682ff8653333014fcc382e662ba596 SHA512 0cb70a74034c4bc4d5340ab7d19288a438f4b6d0c4c63ac95d1f4cc3c5fdfe1370a27a607605a6f0c85ea6f371141c55abfdb4438d9e87b2d544fff5674f7ce4 -EBUILD sparse-0.4.3.ebuild 1322 BLAKE2B 749e70acabe5932b09851d5b51aabeb05cc0de325cc153f4fc5966df9047e6d14fbba8d81de1798397121a3836be45768beffe9e28a2bd3b98eb3988066deacb SHA512 6fd02eeb079aa4d042dbb541943c3a7b3e2c53dca0f06230fa627bb89558259a9bd78c7b54f4f5f87a4fc9318db0894aa7d3e6fa924d5d841099ab95913d8d83 -EBUILD sparse-0.4.4.ebuild 1167 BLAKE2B 1f82b207002f728ac590fa648edfd56b1175110e8d00a73c212f2a163a06ca9fc87c1423035625da6dc455349cbcbfa44a74d63650c738af0eb7366078562240 SHA512 02606f9f9925a0c10b40512dc292a16d9ef98a8cb40194bb5a00950e1f3efe68074d1b00b438b38e7bb2a61f4b076b05dbad68f2eeaa8d4506fbb45070ab1cdc -EBUILD sparse-0.5.0.ebuild 1226 BLAKE2B c3f3fa210aa80790711b1258d2b49f3891cd7a7b4653432a90c0f0e35fbe56713f73ff4b31743deda6c34bbb44ff3207241e55e6459bf5d3376f58b4da2f9cf1 SHA512 2bad4ec621b8e2998fc8cd909031060b15df6d93343582aa2f51553aa681ab58a0b3a9b58999d7e9dfe7d332baf57a4c6ed6b448389efe3e3db44399cf1aca2e -EBUILD sparse-9999.ebuild 1226 BLAKE2B c3f3fa210aa80790711b1258d2b49f3891cd7a7b4653432a90c0f0e35fbe56713f73ff4b31743deda6c34bbb44ff3207241e55e6459bf5d3376f58b4da2f9cf1 SHA512 2bad4ec621b8e2998fc8cd909031060b15df6d93343582aa2f51553aa681ab58a0b3a9b58999d7e9dfe7d332baf57a4c6ed6b448389efe3e3db44399cf1aca2e -MISC metadata.xml 525 BLAKE2B 956633b76bd4f8edde355ea0cec33cc8b3724eeb74bb14f8d2e21a50c0463d5edcc98d2d254f1c87bd246c7148827cdc977d532c847e4bc0ada7395d0b13baa6 SHA512 13276deb8b8de0457f74caaeef8cb268af9489f66b6714e376cf78927890b011f5523f284cc069ff5f955d78ddcf83d21db035d24ea3b7c4b670350e17f9aaa5 +AUX sparse-0.5.1-cmdline-include.patch 1886 BLAKE2B 328a414d8c24f02e682978b7b6fef225519f5c5036ebb6f052dc930536ceb7232dfd45ccd158eaa712d2c4c1c622261969c24703bf4b69d6b625c0be4d397204 SHA512 d4267e94d7603b421a1df09869706114b5f81867ddd1d758b1dd251232f645e4a0c14df1d2bb993c78d14afaa699f84f7754b62fae19d1ccabe28571550d92f7 +DIST sparse-0.5.1.tar.gz 278241 BLAKE2B 6004631c97e2a126d1e239aa1d8fcc540a92b3f63a6a2615f2f63b79a001495e8b27ffa7377c57b43227f3b50288be24cb4657c7801806f7c6d1d11b0f8c8ee9 SHA512 04a26e2b44d99e7402b5e8a8f61ecbd62adbc9c481a0c3c8e0ab2f9599d99f50679ce3f3d0c1ccfd6204c6ec5d9fa272f9fc4c4d21173897ebd592d14c6ee852 +EBUILD sparse-0.5.1.ebuild 1312 BLAKE2B bd5f1b80cfff1c5829436f4100e13c9e38aeb31de616762c10a995988d2edb45fbc0fd5283b2c9dcf1c01bc8176e556be62eff2632498b8b293bfe91b813685a SHA512 566ca832c7b3819268eff5b9ab152ffce778b6a55fcf492a19013f80597639757de06c24dcf6702cc2620ed2013e47a635fd7f7c32ec2047e7b04ab64575cb7d +EBUILD sparse-9999.ebuild 1312 BLAKE2B bd5f1b80cfff1c5829436f4100e13c9e38aeb31de616762c10a995988d2edb45fbc0fd5283b2c9dcf1c01bc8176e556be62eff2632498b8b293bfe91b813685a SHA512 566ca832c7b3819268eff5b9ab152ffce778b6a55fcf492a19013f80597639757de06c24dcf6702cc2620ed2013e47a635fd7f7c32ec2047e7b04ab64575cb7d +MISC metadata.xml 636 BLAKE2B 48bac3e5bb329089c8923cfbdd0bd32efa8202c5f43a8179b044c70fdc1fcb73090b0765fe3d2b6e33fd0364f5ca25eec07aabd152dff21948074a2099c5367e SHA512 b46ed66da3644ecf4e2cdb6a0ecd9fd18e99cfb6aea1967acf1119d1f75c4907889a3fbcda76ef2d3c4b1617d718a946e5fb01e75db105d740a98c49430da859 diff --git a/sys-devel/sparse/files/sparse-0.4.3-gentoo.patch b/sys-devel/sparse/files/sparse-0.4.3-gentoo.patch deleted file mode 100644 index 6f46687d78b3..000000000000 --- a/sys-devel/sparse/files/sparse-0.4.3-gentoo.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/Makefile b/Makefile -index 74905df..1f2b2b6 100644 ---- a/Makefile -+++ b/Makefile -@@ -4,7 +4,7 @@ OS = linux - - - CC = gcc --CFLAGS = -O2 -finline-functions -fno-strict-aliasing -g -+CFLAGS ?= -O2 -finline-functions -fno-strict-aliasing -g - CFLAGS += -Wall -Wwrite-strings - LDFLAGS += -g - AR = ar -@@ -21,7 +21,8 @@ HAVE_GCC_DEP:=$(shell touch .gcc-test.c && \ - echo 'yes'; rm -f .gcc-test.d .gcc-test.o .gcc-test.c) - HAVE_GTK2:=$(shell pkg-config --exists gtk+-2.0 2>/dev/null && echo 'yes') - --CFLAGS += -DGCC_BASE=\"$(shell $(CC) --print-file-name=)\" -+GCC_BASE = $(shell $(CC) --print-file-name=) -+CFLAGS += -DGCC_BASE=\"$(GCC_BASE)\" - - ifeq ($(HAVE_GCC_DEP),yes) - CFLAGS += -Wp,-MD,$(@D)/.$(@F).d -@@ -113,7 +114,9 @@ SED_PC_CMD = 's|@version@|$(VERSION)|g; \ - - all: $(PROGRAMS) sparse.pc - --install: $(INST_PROGRAMS) $(LIBS) $(LIB_H) sparse.pc -+all-installable: $(INST_PROGRAMS) $(LIBS) $(LIB_H) sparse.pc -+ -+install: all-installable - $(Q)install -d $(DESTDIR)$(BINDIR) - $(Q)install -d $(DESTDIR)$(LIBDIR) - $(Q)install -d $(DESTDIR)$(MAN1DIR) -diff --git a/parse.h b/parse.h -index 6b21e23..b26bd03 100644 ---- a/parse.h -+++ b/parse.h -@@ -35,10 +35,6 @@ struct statement { - struct /* declaration */ { - struct symbol_list *declaration; - }; -- struct /* label_arg */ { -- struct symbol *label; -- struct statement *label_statement; -- }; - struct { - struct expression *expression; - struct expression *context; diff --git a/sys-devel/sparse/files/sparse-0.5.1-cmdline-include.patch b/sys-devel/sparse/files/sparse-0.5.1-cmdline-include.patch new file mode 100644 index 000000000000..5ea763001a05 --- /dev/null +++ b/sys-devel/sparse/files/sparse-0.5.1-cmdline-include.patch @@ -0,0 +1,66 @@ +diff --git a/validation/include-eval.c b/validation/include-eval.c +new file mode 100644 +index 000000000..bf9bf63fe +--- /dev/null ++++ b/validation/include-eval.c +@@ -0,0 +1,7 @@ ++/* nothing */ ++ ++/* ++ * check-name: include-eval.c ++ * check-command: sparse -include ./include-eval.inc $file ++ * check-known-to-fail ++ */ +diff --git a/validation/include-eval.inc b/validation/include-eval.inc +new file mode 100644 +index 000000000..e2561ca41 +--- /dev/null ++++ b/validation/include-eval.inc +@@ -0,0 +1,12 @@ ++typedef unsigned long long_t; ++ ++inline ++static unsigned int ok(void) ++{ ++ return sizeof(long_t); ++} ++ ++static unsigned int ko(void) ++{ ++ return sizeof(long_t); ++} +diff --git a/lib.c b/lib.c +index 4602cf85d..b255fec14 100644 +--- a/lib.c ++++ b/lib.c +@@ -1351,6 +1351,20 @@ struct symbol_list *sparse_initialize(int argc, char **argv, struct string_list + */ + protect_token_alloc(); + } ++ /* ++ * Evaluate the complete symbol list ++ * Note: This is not needed for normal cases. ++ * These symbols should only be predefined defines and ++ * declaratons which will be evaluated later, when needed. ++ * This is also the case when a file is directly included via ++ * '-include <file>' on the command line *AND* the file only ++ * contains defines, declarations and inline definitions. ++ * However, in the rare cases where the given file should ++ * contain some definitions, these will never be evaluated ++ * and thus won't be able to be linearized correctly. ++ * Hence the evaluate_symbol_list() here under. ++ */ ++ evaluate_symbol_list(list); + return list; + } + +diff --git a/validation/include-eval.c b/validation/include-eval.c +index bf9bf63fe..1a91dab84 100644 +--- a/validation/include-eval.c ++++ b/validation/include-eval.c +@@ -3,5 +3,4 @@ + /* + * check-name: include-eval.c + * check-command: sparse -include ./include-eval.inc $file +- * check-known-to-fail + */ diff --git a/sys-devel/sparse/metadata.xml b/sys-devel/sparse/metadata.xml index 58fef00ea442..ee8e0692a0ca 100644 --- a/sys-devel/sparse/metadata.xml +++ b/sys-devel/sparse/metadata.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person"> + <email>zx2c4@gentoo.org</email> + <name>Jason A. Donenfeld</name> + </maintainer> <maintainer type="project"> <email>toolchain@gentoo.org</email> <name>Gentoo Toolchain Project</name> diff --git a/sys-devel/sparse/sparse-0.4.3.ebuild b/sys-devel/sparse/sparse-0.4.3.ebuild deleted file mode 100644 index c351211de29d..000000000000 --- a/sys-devel/sparse/sparse-0.4.3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" - -inherit eutils multilib flag-o-matic toolchain-funcs -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/sparse/sparse.git" - inherit git -fi - -DESCRIPTION="C semantic parser" -HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page" - -if [[ ${PV} == "9999" ]] ; then - SRC_URI="" - #KEYWORDS="" -else - SRC_URI="mirror://kernel/software/devel/sparse/dist/${P}.tar.bz2" - KEYWORDS="amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86" -fi - -LICENSE="OSL-1.1" -SLOT="0" -IUSE="gtk xml test" - -RDEPEND="gtk? ( x11-libs/gtk+:2 ) - xml? ( dev-libs/libxml2 )" -DEPEND="${RDEPEND} - gtk? ( virtual/pkgconfig ) - xml? ( virtual/pkgconfig )" - -src_prepare() { - # https://cgit.gentoo.org/proj/sparse.git - epatch "${FILESDIR}"/${P}-gentoo.patch -} - -mymake() { - usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; } - - emake \ - V=1 \ - CC="$(tc-getCC)" \ - GCC_BASE="$(gcc-config -L | cut -d : -f1)" \ - HAVE_LIBXML=$(usex xml) \ - HAVE_GTK2=$(usex gtk) \ - PREFIX=/usr \ - LIBDIR="/usr/$(get_libdir)" \ - DESTDIR="${D}" \ - "$@" \ - || die -} - -src_compile() { - append-flags -fno-strict-aliasing - - mymake \ - $(use test && echo all) all-installable -} - -src_install() { - mymake install - dodoc FAQ README -} diff --git a/sys-devel/sparse/sparse-0.4.4.ebuild b/sys-devel/sparse/sparse-0.4.4.ebuild deleted file mode 100644 index 51173588d3c2..000000000000 --- a/sys-devel/sparse/sparse-0.4.4.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit eutils multilib toolchain-funcs -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/sparse/sparse.git" - inherit git-2 -fi - -DESCRIPTION="C semantic parser" -HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page" - -if [[ ${PV} == "9999" ]] ; then - SRC_URI="" - #KEYWORDS="" -else - SRC_URI="mirror://kernel/software/devel/sparse/dist/${P}.tar.bz2" - KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -fi - -LICENSE="OSL-1.1" -SLOT="0" -IUSE="gtk test xml" - -RDEPEND="gtk? ( x11-libs/gtk+:2 ) - xml? ( dev-libs/libxml2 )" -DEPEND="${RDEPEND} - gtk? ( virtual/pkgconfig ) - xml? ( virtual/pkgconfig )" - -src_prepare() { - tc-export AR CC PKG_CONFIG - sed -i \ - -e '/^PREFIX=/s:=.*:=/usr:' \ - -e "/^LIBDIR=/s:/lib:/$(get_libdir):" \ - -e '/^CFLAGS =/{s:=:+= $(CPPFLAGS):;s:-O2 -finline-functions::}' \ - -e "s:pkg-config:${PKG_CONFIG}:" \ - Makefile || die - export MAKEOPTS+=" V=1 AR=${AR} CC=${CC} HAVE_GTK2=$(usex gtk) HAVE_LIBXML=$(usex xml)" -} - -src_compile() { - emake $(usex test all all-installable) -} diff --git a/sys-devel/sparse/sparse-0.5.0.ebuild b/sys-devel/sparse/sparse-0.5.1.ebuild index 8771de72828a..aad07d85db73 100644 --- a/sys-devel/sparse/sparse-0.5.0.ebuild +++ b/sys-devel/sparse/sparse-0.5.1.ebuild @@ -1,26 +1,23 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=6 inherit eutils multilib toolchain-funcs -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/sparse/sparse.git" - inherit git-2 -fi DESCRIPTION="C semantic parser" HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page" if [[ ${PV} == "9999" ]] ; then - SRC_URI="" - #KEYWORDS="" + inherit git-r3 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git" + KEYWORDS="" else - SRC_URI="mirror://kernel/software/devel/sparse/dist/${P}.tar.xz" + SRC_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git/snapshot/${P}.tar.gz" KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi -LICENSE="OSL-1.1" +LICENSE="MIT" SLOT="0" IUSE="gtk llvm test xml" @@ -31,15 +28,18 @@ DEPEND="${RDEPEND} gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig )" +PATCHES=( "${FILESDIR}/${PN}-0.5.1-cmdline-include.patch" ) + src_prepare() { tc-export AR CC PKG_CONFIG sed -i \ -e '/^PREFIX=/s:=.*:=/usr:' \ -e "/^LIBDIR=/s:/lib:/$(get_libdir):" \ - -e '/^CFLAGS =/{s:=:+= $(CPPFLAGS):;s:-O2 -finline-functions::}' \ + -e '/^COMMON_CFLAGS =/{s:=:= $(CPPFLAGS):;s:-O2 -finline-functions -fno-strict-aliasing -g:-fno-strict-aliasing:}' \ -e "s:pkg-config:${PKG_CONFIG}:" \ Makefile || die export MAKEOPTS+=" V=1 AR=${AR} CC=${CC} HAVE_GTK2=$(usex gtk) HAVE_LLVM=$(usex llvm) HAVE_LIBXML=$(usex xml)" + default } src_compile() { diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-9999.ebuild index 8771de72828a..aad07d85db73 100644 --- a/sys-devel/sparse/sparse-9999.ebuild +++ b/sys-devel/sparse/sparse-9999.ebuild @@ -1,26 +1,23 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=6 inherit eutils multilib toolchain-funcs -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/sparse/sparse.git" - inherit git-2 -fi DESCRIPTION="C semantic parser" HOMEPAGE="https://sparse.wiki.kernel.org/index.php/Main_Page" if [[ ${PV} == "9999" ]] ; then - SRC_URI="" - #KEYWORDS="" + inherit git-r3 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git" + KEYWORDS="" else - SRC_URI="mirror://kernel/software/devel/sparse/dist/${P}.tar.xz" + SRC_URI="https://git.kernel.org/pub/scm/devel/${PN}/${PN}.git/snapshot/${P}.tar.gz" KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi -LICENSE="OSL-1.1" +LICENSE="MIT" SLOT="0" IUSE="gtk llvm test xml" @@ -31,15 +28,18 @@ DEPEND="${RDEPEND} gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig )" +PATCHES=( "${FILESDIR}/${PN}-0.5.1-cmdline-include.patch" ) + src_prepare() { tc-export AR CC PKG_CONFIG sed -i \ -e '/^PREFIX=/s:=.*:=/usr:' \ -e "/^LIBDIR=/s:/lib:/$(get_libdir):" \ - -e '/^CFLAGS =/{s:=:+= $(CPPFLAGS):;s:-O2 -finline-functions::}' \ + -e '/^COMMON_CFLAGS =/{s:=:= $(CPPFLAGS):;s:-O2 -finline-functions -fno-strict-aliasing -g:-fno-strict-aliasing:}' \ -e "s:pkg-config:${PKG_CONFIG}:" \ Makefile || die export MAKEOPTS+=" V=1 AR=${AR} CC=${CC} HAVE_GTK2=$(usex gtk) HAVE_LLVM=$(usex llvm) HAVE_LIBXML=$(usex xml)" + default } src_compile() { |