* [gentoo-commits] repo/gentoo:master commit in: dev-libs/cloog/files/, dev-libs/cloog/
@ 2019-11-10 22:11 Sergei Trofimovich
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Trofimovich @ 2019-11-10 22:11 UTC (permalink / raw
To: gentoo-commits
commit: f7b80c7b52b7516ea54a1f0ccae1e8e665cb1346
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 22:08:08 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 22:08:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7b80c7b
dev-libs/cloog: drop old
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-libs/cloog/Manifest | 2 -
dev-libs/cloog/cloog-0.18.0.ebuild | 40 ------------
dev-libs/cloog/cloog-0.18.3.ebuild | 64 ------------------
dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch | 82 ------------------------
4 files changed, 188 deletions(-)
diff --git a/dev-libs/cloog/Manifest b/dev-libs/cloog/Manifest
index e698e58b590..abc759ecd58 100644
--- a/dev-libs/cloog/Manifest
+++ b/dev-libs/cloog/Manifest
@@ -1,4 +1,2 @@
-DIST cloog-0.18.0.tar.gz 3776262 BLAKE2B fec90c701f2042c0bfdd68099ec6ef66ecc261193ff48c76787d1ad28e689be8d1685dfc99f0ddbe2a1cbf83aebe30eb0571dfeca53c03f6abaf190ca35d492c SHA512 34404984c4269dfc19673712271b08f220b6b49e451e7479cefbc5d2f27ab8e780f5d51fbbc7cecb974dab655673d8348f2a1ece3a60feaeeb9413fccf16eb1d
DIST cloog-0.18.1.tar.gz 3857324 BLAKE2B 5898cb8d8f36e55dbe38e7866e07c0abaf8ca0b9e619a5ff963ae975148166fc9bb1c77a33aef1ea2014e739e4ea1c37e4bc2ce5e7411d900fb472192e6fed7b SHA512 0b12d9f3c39a2425e28e1d7c0a2b3787287fe3e6e3052f094d2ab6cffeb205ce19044100cbfd805659b3e6b3d21ac2f5a3c92848f476de54edfe6b1cbd2172e9
-DIST cloog-0.18.3.tar.gz 4577597 BLAKE2B 179f13d4cf1f3c13ed5afcbad9226a1fc496aac5c56f6129457516a8e52ec753c8ac3532f7ac975b62e0dc09ed4b84523ebb7146a7bd991bee04d3416558c8c4 SHA512 14fc2af0da62cd17b1a9f5a7a1704da6bfe5dc78639928637588203e61847795a652ff788c313c34b6e7dd85fb329678eb4f72e0e1c9c149be6619ebf046cff8
DIST cloog-0.18.4.tar.gz 4796456 BLAKE2B 9d1f281abe48d40f726c3fc66c58c0d7cb90f6d3ca47af02c8f00b5cc69c6de6b0362b2dc406a8cb6310e07c6b2991f6de3b6b407ad7db0190b9bc69ac82773f SHA512 d35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23
diff --git a/dev-libs/cloog/cloog-0.18.0.ebuild b/dev-libs/cloog/cloog-0.18.0.ebuild
deleted file mode 100644
index 8e70a9c5c21..00000000000
--- a/dev-libs/cloog/cloog-0.18.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="A loop generator for scanning polyhedra"
-HOMEPAGE="http://www.bastoul.net/cloog/"
-SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static-libs"
-
-DEPEND="dev-libs/gmp
- <dev-libs/isl-0.13
- !dev-libs/cloog-ppl"
-RDEPEND="${DEPEND}"
-
-DOCS=( README )
-
-src_prepare() {
- # m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
- # sed to avoid eautoreconf
- sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
-}
-
-src_configure() {
- econf \
- --with-isl=system \
- --with-polylib=no \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/dev-libs/cloog/cloog-0.18.3.ebuild b/dev-libs/cloog/cloog-0.18.3.ebuild
deleted file mode 100644
index 12ab4e9cdeb..00000000000
--- a/dev-libs/cloog/cloog-0.18.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib-minimal
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="git://repo.or.cz/cloog.git"
- inherit autotools git-r3
-else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
- SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="A loop generator for scanning polyhedra"
-HOMEPAGE="http://www.bastoul.net/cloog/"
-
-LICENSE="LGPL-2.1"
-SLOT="0/4"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
- >=dev-libs/isl-0.14:0=[${MULTILIB_USEDEP}]
- !dev-libs/cloog-ppl"
-DEPEND="${DEPEND}
- virtual/pkgconfig"
-
-DOCS=( README )
-
-src_prepare() {
- if [[ ${PV} == "9999" ]] ; then
- ./get_submodules.sh
- eautoreconf -i
- else
- # m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
- # sed to avoid eautoreconf
- sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
- fi
-
- epatch "${FILESDIR}"/${P}-isl-0.15.patch
-
- # Make sure we always use the system isl.
- rm -rf isl
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --with-gmp=system \
- --with-isl=system \
- --with-osl=no \
- $(use_enable static-libs static)
-}
-
-# The default src_test() fails, so we'll just run these directly
-multilib_src_test () {
- echo ">>> Test phase [check]: ${CATEGORY}/${PF}"
- emake -j1 check
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
diff --git a/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch b/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch
deleted file mode 100644
index 70ce3b86ec0..00000000000
--- a/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-add support for isl-0.15+
-
---- a/source/isl/domain.c
-+++ b/source/isl/domain.c
-@@ -68,25 +68,39 @@
- void cloog_domain_print_constraints(FILE *foo, CloogDomain *domain,
- int print_number)
- {
-+ isl_printer *printer;
- isl_basic_set *bset;
- isl_set *set = isl_set_from_cloog_domain(domain);
-
-- if (print_number)
-- isl_set_print(set, foo, 0, ISL_FORMAT_EXT_POLYLIB);
-- else {
-+ printer = isl_printer_to_file(isl_set_get_ctx(set), foo);
-+ printer = isl_printer_set_indent(printer, 0);
-+ printer = isl_printer_set_prefix(printer, NULL);
-+ printer = isl_printer_set_suffix(printer, NULL);
-+
-+ if (print_number) {
-+ printer = isl_printer_set_output_format(printer, ISL_FORMAT_EXT_POLYLIB);
-+ printer = isl_printer_print_set(printer, set);
-+ } else {
- assert(isl_set_n_basic_set(set) == 1);
- bset = isl_set_copy_basic_set(set);
-- isl_basic_set_print(bset, foo,
-- 0, NULL, NULL, ISL_FORMAT_POLYLIB);
-+ printer = isl_printer_set_output_format(printer, ISL_FORMAT_POLYLIB);
-+ isl_printer_print_basic_set(printer, bset);
- isl_basic_set_free(bset);
- }
-+
-+ isl_printer_free(printer);
- }
-
-
- void cloog_scattering_print_constraints(FILE *foo, CloogScattering *scattering)
- {
-+ isl_printer *printer;
- isl_map *map = isl_map_from_cloog_scattering(scattering);
-- isl_map_print(map, foo, 0, ISL_FORMAT_EXT_POLYLIB);
-+ printer = isl_printer_to_file(isl_map_get_ctx(map), foo);
-+ printer = isl_printer_set_indent(printer, 0);
-+ printer = isl_printer_set_output_format(printer, ISL_FORMAT_EXT_POLYLIB);
-+ printer = isl_printer_print_map(printer, map);
-+ isl_printer_free(printer);
- }
-
-
-@@ -343,6 +357,7 @@
- void cloog_domain_print_structure(FILE *file, CloogDomain *domain, int level,
- const char *name)
- {
-+ isl_printer *printer;
- int i ;
- isl_set *set = isl_set_from_cloog_domain(domain);
-
-@@ -358,7 +373,11 @@
- for (i = 0; i < level+1; ++i)
- fprintf(file, "|\t");
-
-- isl_set_print(set, file, 0, ISL_FORMAT_ISL);
-+ printer = isl_printer_to_file(isl_set_get_ctx(set), file);
-+ printer = isl_printer_set_indent(printer, 0);
-+ printer = isl_printer_set_output_format(printer, ISL_FORMAT_EXT_POLYLIB);
-+ printer = isl_printer_print_set(printer, set);
-+ isl_printer_free(printer);
-
- fprintf(file, "\n");
- }
---- a/source/isl/constraints.c
-+++ b/source/isl/constraints.c
-@@ -450,7 +450,7 @@ CloogConstraintSet *cloog_constraint_set_copy(CloogConstraintSet *constraints)
- {
- isl_basic_set *bset;
- bset = cloog_constraints_set_to_isl(constraints);
-- return cloog_constraint_set_from_isl_basic_set(isl_basic_set_dup(bset));
-+ return cloog_constraint_set_from_isl_basic_set(isl_basic_set_copy(bset));
- }
-
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/cloog/files/, dev-libs/cloog/
@ 2020-10-10 4:58 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2020-10-10 4:58 UTC (permalink / raw
To: gentoo-commits
commit: 363cc16a8592873a519a7479d93a44f2e4fbcdc3
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Sat Oct 10 00:37:18 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 04:52:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=363cc16a
dev-libs/cloog: version bump to 0.20.0
all 4 tests are passing
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/cloog/Manifest | 1 +
dev-libs/cloog/cloog-0.20.0.ebuild | 60 +++++++++++++++++++++++++++
dev-libs/cloog/cloog-9999.ebuild | 57 ++++++++++++-------------
dev-libs/cloog/files/cloog-0.20.0-notex.patch | 37 +++++++++++++++++
4 files changed, 125 insertions(+), 30 deletions(-)
diff --git a/dev-libs/cloog/Manifest b/dev-libs/cloog/Manifest
index 27217237993..efb9d9bb799 100644
--- a/dev-libs/cloog/Manifest
+++ b/dev-libs/cloog/Manifest
@@ -1 +1,2 @@
DIST cloog-0.18.4.tar.gz 4796456 BLAKE2B 9d1f281abe48d40f726c3fc66c58c0d7cb90f6d3ca47af02c8f00b5cc69c6de6b0362b2dc406a8cb6310e07c6b2991f6de3b6b407ad7db0190b9bc69ac82773f SHA512 d35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23
+DIST cloog-0.20.0.tar.gz 512106 BLAKE2B ac5ce6b7bb6ad586fc614c02b7c2e7c17322e49a775e21b50fb9862e487b4278a2b1024a7269830b55be1ae3c4b4c70f3d411d6c86052483bda124bc9bc07b20 SHA512 2663bbce49c42436681750968823dbee9b3cfbe4c086f5b340d11e51d8c8f138d1a2ccfd1691ae4395b94c082ccc49c0d7e5a1475b29192d13ab3c0148a8c347
diff --git a/dev-libs/cloog/cloog-0.20.0.ebuild b/dev-libs/cloog/cloog-0.20.0.ebuild
new file mode 100644
index 00000000000..cf8d94e5786
--- /dev/null
+++ b/dev-libs/cloog/cloog-0.20.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools eutils
+
+DESCRIPTION="A loop generator for scanning polyhedra"
+HOMEPAGE="http://www.bastoul.net/cloog/
+ https://github.com/periscop/cloog
+"
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/periscop/cloog"
+else
+ SRC_URI="https://github.com/periscop/cloog/archive/${P}.tar.gz"
+ S="${WORKDIR}"/cloog-${P}
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4"
+IUSE="static-libs"
+
+RDEPEND="
+ dev-libs/gmp
+ dev-libs/isl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.20.0-notex.patch )
+
+DOCS=( README )
+
+src_prepare() {
+ default
+ AT_NO_RECURSIVE=yes eautoreconf -i
+ # m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
+ # sed to avoid eautoreconf
+ sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
+
+ # Make sure we always use the system isl.
+ rm -rf isl || die
+}
+
+src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ --with-gmp=system \
+ --with-isl=system \
+ --with-osl=no \
+ $(use_enable static-libs static)
+}
+
+# The default src_test() fails, so we'll just run these directly
+src_test() {
+ elog ">>> Test phase [check]: ${CATEGORY}/${PF}"
+ emake -j1 check
+}
diff --git a/dev-libs/cloog/cloog-9999.ebuild b/dev-libs/cloog/cloog-9999.ebuild
index c85bd46b030..cf8d94e5786 100644
--- a/dev-libs/cloog/cloog-9999.ebuild
+++ b/dev-libs/cloog/cloog-9999.ebuild
@@ -3,47 +3,49 @@
EAPI="7"
-inherit eutils multilib-minimal
+inherit autotools eutils
-if [[ ${PV} == *9999 ]] ; then
- inherit autotools git-r3
- EGIT_REPO_URI="https://repo.or.cz/cloog.git"
+DESCRIPTION="A loop generator for scanning polyhedra"
+HOMEPAGE="http://www.bastoul.net/cloog/
+ https://github.com/periscop/cloog
+"
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/periscop/cloog"
else
+ SRC_URI="https://github.com/periscop/cloog/archive/${P}.tar.gz"
+ S="${WORKDIR}"/cloog-${P}
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
- SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
fi
-DESCRIPTION="A loop generator for scanning polyhedra"
-HOMEPAGE="http://www.bastoul.net/cloog/"
-
LICENSE="LGPL-2.1"
SLOT="0/4"
IUSE="static-libs"
-RDEPEND=">=dev-libs/gmp-6.0.0[${MULTILIB_USEDEP}]
- >=dev-libs/isl-0.15:0=[${MULTILIB_USEDEP}]"
-DEPEND="${DEPEND}
- virtual/pkgconfig"
+RDEPEND="
+ dev-libs/gmp
+ dev-libs/isl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.20.0-notex.patch )
DOCS=( README )
src_prepare() {
default
-
- if [[ ${PV} == "9999" ]] ; then
- ./get_submodules.sh
- eautoreconf -i
- else
- # m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
- # sed to avoid eautoreconf
- sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
- fi
+ AT_NO_RECURSIVE=yes eautoreconf -i
+ # m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
+ # sed to avoid eautoreconf
+ sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
# Make sure we always use the system isl.
- rm -rf isl
+ rm -rf isl || die
}
-multilib_src_configure() {
+src_configure() {
ECONF_SOURCE="${S}" econf \
--with-gmp=system \
--with-isl=system \
@@ -52,12 +54,7 @@ multilib_src_configure() {
}
# The default src_test() fails, so we'll just run these directly
-multilib_src_test() {
- echo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+src_test() {
+ elog ">>> Test phase [check]: ${CATEGORY}/${PF}"
emake -j1 check
}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -type f -name '*.la' -delete
-}
diff --git a/dev-libs/cloog/files/cloog-0.20.0-notex.patch b/dev-libs/cloog/files/cloog-0.20.0-notex.patch
new file mode 100644
index 00000000000..72c75a1820d
--- /dev/null
+++ b/dev-libs/cloog/files/cloog-0.20.0-notex.patch
@@ -0,0 +1,37 @@
+diff --git a/Makefile.am b/Makefile.am
+index 9edba30..fcca42f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -181,19 +181,6 @@ doc:
+ @echo " *-----------------------------------------------*/"
+ doxygen ./autoconf/Doxyfile
+
+-#/*****************************************************************************
+-# * Doc *
+-# *****************************************************************************/
+-
+-if HAVE_TEXI2DVI
+-pdf_DATA = doc/cloog.pdf
+-dist_pdf_DATA = doc/cloog.pdf
+-doc/cloog.pdf: doc/cloog.texi doc/gitversion.texi
+- $(TEXI2DVI) -I $(top_builddir)/doc --pdf $< -o $@
+-endif
+-
+-doc/gitversion.texi: @GIT_INDEX@
+- echo '@set VERSION '`$(top_builddir)/genversion.sh`'' > $@
+
+ #/*****************************************************************************
+ # * Tests *
+diff --git a/configure.ac b/configure.ac
+index 88d346d..fec9b04 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,8 +72,6 @@ AC_CHECK_PROG(CD, cd)
+ dnl Configure needs an empty install.sh file with this, i HATE that...
+ AC_PROG_INSTALL
+ AC_PROG_LIBTOOL
+-AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, [])
+-AM_CONDITIONAL(HAVE_TEXI2DVI, test -n "$TEXI2DVI")
+
+ AX_CC_MAXOPT
+ AC_SUBST(CFLAGS_WARN)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-10 4:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-10 4:58 [gentoo-commits] repo/gentoo:master commit in: dev-libs/cloog/files/, dev-libs/cloog/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2019-11-10 22:11 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox