1 |
commit: 363cc16a8592873a519a7479d93a44f2e4fbcdc3 |
2 |
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> |
3 |
AuthorDate: Sat Oct 10 00:37:18 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 10 04:52:13 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=363cc16a |
7 |
|
8 |
dev-libs/cloog: version bump to 0.20.0 |
9 |
|
10 |
all 4 tests are passing |
11 |
|
12 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
13 |
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> |
14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
15 |
|
16 |
dev-libs/cloog/Manifest | 1 + |
17 |
dev-libs/cloog/cloog-0.20.0.ebuild | 60 +++++++++++++++++++++++++++ |
18 |
dev-libs/cloog/cloog-9999.ebuild | 57 ++++++++++++------------- |
19 |
dev-libs/cloog/files/cloog-0.20.0-notex.patch | 37 +++++++++++++++++ |
20 |
4 files changed, 125 insertions(+), 30 deletions(-) |
21 |
|
22 |
diff --git a/dev-libs/cloog/Manifest b/dev-libs/cloog/Manifest |
23 |
index 27217237993..efb9d9bb799 100644 |
24 |
--- a/dev-libs/cloog/Manifest |
25 |
+++ b/dev-libs/cloog/Manifest |
26 |
@@ -1 +1,2 @@ |
27 |
DIST cloog-0.18.4.tar.gz 4796456 BLAKE2B 9d1f281abe48d40f726c3fc66c58c0d7cb90f6d3ca47af02c8f00b5cc69c6de6b0362b2dc406a8cb6310e07c6b2991f6de3b6b407ad7db0190b9bc69ac82773f SHA512 d35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23 |
28 |
+DIST cloog-0.20.0.tar.gz 512106 BLAKE2B ac5ce6b7bb6ad586fc614c02b7c2e7c17322e49a775e21b50fb9862e487b4278a2b1024a7269830b55be1ae3c4b4c70f3d411d6c86052483bda124bc9bc07b20 SHA512 2663bbce49c42436681750968823dbee9b3cfbe4c086f5b340d11e51d8c8f138d1a2ccfd1691ae4395b94c082ccc49c0d7e5a1475b29192d13ab3c0148a8c347 |
29 |
|
30 |
diff --git a/dev-libs/cloog/cloog-0.20.0.ebuild b/dev-libs/cloog/cloog-0.20.0.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..cf8d94e5786 |
33 |
--- /dev/null |
34 |
+++ b/dev-libs/cloog/cloog-0.20.0.ebuild |
35 |
@@ -0,0 +1,60 @@ |
36 |
+# Copyright 1999-2020 Gentoo Authors |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI="7" |
40 |
+ |
41 |
+inherit autotools eutils |
42 |
+ |
43 |
+DESCRIPTION="A loop generator for scanning polyhedra" |
44 |
+HOMEPAGE="http://www.bastoul.net/cloog/ |
45 |
+ https://github.com/periscop/cloog |
46 |
+" |
47 |
+ |
48 |
+if [[ ${PV} == 9999 ]] ; then |
49 |
+ inherit git-r3 |
50 |
+ EGIT_REPO_URI="https://github.com/periscop/cloog" |
51 |
+else |
52 |
+ SRC_URI="https://github.com/periscop/cloog/archive/${P}.tar.gz" |
53 |
+ S="${WORKDIR}"/cloog-${P} |
54 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" |
55 |
+fi |
56 |
+ |
57 |
+LICENSE="LGPL-2.1" |
58 |
+SLOT="0/4" |
59 |
+IUSE="static-libs" |
60 |
+ |
61 |
+RDEPEND=" |
62 |
+ dev-libs/gmp |
63 |
+ dev-libs/isl |
64 |
+" |
65 |
+DEPEND="${RDEPEND}" |
66 |
+BDEPEND="virtual/pkgconfig" |
67 |
+ |
68 |
+PATCHES=( "${FILESDIR}"/${PN}-0.20.0-notex.patch ) |
69 |
+ |
70 |
+DOCS=( README ) |
71 |
+ |
72 |
+src_prepare() { |
73 |
+ default |
74 |
+ AT_NO_RECURSIVE=yes eautoreconf -i |
75 |
+ # m4/ax_create_pkgconfig_info.m4 includes LDFLAGS |
76 |
+ # sed to avoid eautoreconf |
77 |
+ sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die |
78 |
+ |
79 |
+ # Make sure we always use the system isl. |
80 |
+ rm -rf isl || die |
81 |
+} |
82 |
+ |
83 |
+src_configure() { |
84 |
+ ECONF_SOURCE="${S}" econf \ |
85 |
+ --with-gmp=system \ |
86 |
+ --with-isl=system \ |
87 |
+ --with-osl=no \ |
88 |
+ $(use_enable static-libs static) |
89 |
+} |
90 |
+ |
91 |
+# The default src_test() fails, so we'll just run these directly |
92 |
+src_test() { |
93 |
+ elog ">>> Test phase [check]: ${CATEGORY}/${PF}" |
94 |
+ emake -j1 check |
95 |
+} |
96 |
|
97 |
diff --git a/dev-libs/cloog/cloog-9999.ebuild b/dev-libs/cloog/cloog-9999.ebuild |
98 |
index c85bd46b030..cf8d94e5786 100644 |
99 |
--- a/dev-libs/cloog/cloog-9999.ebuild |
100 |
+++ b/dev-libs/cloog/cloog-9999.ebuild |
101 |
@@ -3,47 +3,49 @@ |
102 |
|
103 |
EAPI="7" |
104 |
|
105 |
-inherit eutils multilib-minimal |
106 |
+inherit autotools eutils |
107 |
|
108 |
-if [[ ${PV} == *9999 ]] ; then |
109 |
- inherit autotools git-r3 |
110 |
- EGIT_REPO_URI="https://repo.or.cz/cloog.git" |
111 |
+DESCRIPTION="A loop generator for scanning polyhedra" |
112 |
+HOMEPAGE="http://www.bastoul.net/cloog/ |
113 |
+ https://github.com/periscop/cloog |
114 |
+" |
115 |
+ |
116 |
+if [[ ${PV} == 9999 ]] ; then |
117 |
+ inherit git-r3 |
118 |
+ EGIT_REPO_URI="https://github.com/periscop/cloog" |
119 |
else |
120 |
+ SRC_URI="https://github.com/periscop/cloog/archive/${P}.tar.gz" |
121 |
+ S="${WORKDIR}"/cloog-${P} |
122 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" |
123 |
- SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz" |
124 |
fi |
125 |
|
126 |
-DESCRIPTION="A loop generator for scanning polyhedra" |
127 |
-HOMEPAGE="http://www.bastoul.net/cloog/" |
128 |
- |
129 |
LICENSE="LGPL-2.1" |
130 |
SLOT="0/4" |
131 |
IUSE="static-libs" |
132 |
|
133 |
-RDEPEND=">=dev-libs/gmp-6.0.0[${MULTILIB_USEDEP}] |
134 |
- >=dev-libs/isl-0.15:0=[${MULTILIB_USEDEP}]" |
135 |
-DEPEND="${DEPEND} |
136 |
- virtual/pkgconfig" |
137 |
+RDEPEND=" |
138 |
+ dev-libs/gmp |
139 |
+ dev-libs/isl |
140 |
+" |
141 |
+DEPEND="${RDEPEND}" |
142 |
+BDEPEND="virtual/pkgconfig" |
143 |
+ |
144 |
+PATCHES=( "${FILESDIR}"/${PN}-0.20.0-notex.patch ) |
145 |
|
146 |
DOCS=( README ) |
147 |
|
148 |
src_prepare() { |
149 |
default |
150 |
- |
151 |
- if [[ ${PV} == "9999" ]] ; then |
152 |
- ./get_submodules.sh |
153 |
- eautoreconf -i |
154 |
- else |
155 |
- # m4/ax_create_pkgconfig_info.m4 includes LDFLAGS |
156 |
- # sed to avoid eautoreconf |
157 |
- sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die |
158 |
- fi |
159 |
+ AT_NO_RECURSIVE=yes eautoreconf -i |
160 |
+ # m4/ax_create_pkgconfig_info.m4 includes LDFLAGS |
161 |
+ # sed to avoid eautoreconf |
162 |
+ sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die |
163 |
|
164 |
# Make sure we always use the system isl. |
165 |
- rm -rf isl |
166 |
+ rm -rf isl || die |
167 |
} |
168 |
|
169 |
-multilib_src_configure() { |
170 |
+src_configure() { |
171 |
ECONF_SOURCE="${S}" econf \ |
172 |
--with-gmp=system \ |
173 |
--with-isl=system \ |
174 |
@@ -52,12 +54,7 @@ multilib_src_configure() { |
175 |
} |
176 |
|
177 |
# The default src_test() fails, so we'll just run these directly |
178 |
-multilib_src_test() { |
179 |
- echo ">>> Test phase [check]: ${CATEGORY}/${PF}" |
180 |
+src_test() { |
181 |
+ elog ">>> Test phase [check]: ${CATEGORY}/${PF}" |
182 |
emake -j1 check |
183 |
} |
184 |
- |
185 |
-multilib_src_install_all() { |
186 |
- einstalldocs |
187 |
- find "${ED}" -type f -name '*.la' -delete |
188 |
-} |
189 |
|
190 |
diff --git a/dev-libs/cloog/files/cloog-0.20.0-notex.patch b/dev-libs/cloog/files/cloog-0.20.0-notex.patch |
191 |
new file mode 100644 |
192 |
index 00000000000..72c75a1820d |
193 |
--- /dev/null |
194 |
+++ b/dev-libs/cloog/files/cloog-0.20.0-notex.patch |
195 |
@@ -0,0 +1,37 @@ |
196 |
+diff --git a/Makefile.am b/Makefile.am |
197 |
+index 9edba30..fcca42f 100644 |
198 |
+--- a/Makefile.am |
199 |
++++ b/Makefile.am |
200 |
+@@ -181,19 +181,6 @@ doc: |
201 |
+ @echo " *-----------------------------------------------*/" |
202 |
+ doxygen ./autoconf/Doxyfile |
203 |
+ |
204 |
+-#/***************************************************************************** |
205 |
+-# * Doc * |
206 |
+-# *****************************************************************************/ |
207 |
+- |
208 |
+-if HAVE_TEXI2DVI |
209 |
+-pdf_DATA = doc/cloog.pdf |
210 |
+-dist_pdf_DATA = doc/cloog.pdf |
211 |
+-doc/cloog.pdf: doc/cloog.texi doc/gitversion.texi |
212 |
+- $(TEXI2DVI) -I $(top_builddir)/doc --pdf $< -o $@ |
213 |
+-endif |
214 |
+- |
215 |
+-doc/gitversion.texi: @GIT_INDEX@ |
216 |
+- echo '@set VERSION '`$(top_builddir)/genversion.sh`'' > $@ |
217 |
+ |
218 |
+ #/***************************************************************************** |
219 |
+ # * Tests * |
220 |
+diff --git a/configure.ac b/configure.ac |
221 |
+index 88d346d..fec9b04 100644 |
222 |
+--- a/configure.ac |
223 |
++++ b/configure.ac |
224 |
+@@ -72,8 +72,6 @@ AC_CHECK_PROG(CD, cd) |
225 |
+ dnl Configure needs an empty install.sh file with this, i HATE that... |
226 |
+ AC_PROG_INSTALL |
227 |
+ AC_PROG_LIBTOOL |
228 |
+-AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, []) |
229 |
+-AM_CONDITIONAL(HAVE_TEXI2DVI, test -n "$TEXI2DVI") |
230 |
+ |
231 |
+ AX_CC_MAXOPT |
232 |
+ AC_SUBST(CFLAGS_WARN) |