[gentoo-commits] repo/proj/guru:master commit in: dev-lang/aldor/
commit: 4dd5263f945a2ae32f4afb3b9633b10546497b27 Author: Alessandro Barbieri gmail com> AuthorDate: Mon Jul 5 01:37:38 2021 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Mon Jul 5 01:37:47 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4dd5263f dev-lang/aldor: fix hardcoded cc Closes: https://bugs.gentoo.org/800257 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri gmail.com> dev-lang/aldor/aldor-1.2.0_p20190730-r1.ebuild | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dev-lang/aldor/aldor-1.2.0_p20190730-r1.ebuild b/dev-lang/aldor/aldor-1.2.0_p20190730-r1.ebuild index 563f8536a..10415d8b0 100644 --- a/dev-lang/aldor/aldor-1.2.0_p20190730-r1.ebuild +++ b/dev-lang/aldor/aldor-1.2.0_p20190730-r1.ebuild @@ -5,7 +5,7 @@ EAPI="7" COMMIT="13e5b90eecc79ec6704efb333c4c100187520e80" -inherit autotools elisp-common flag-o-matic java-pkg-opt-2 +inherit autotools elisp-common flag-o-matic java-pkg-opt-2 toolchain-funcs DESCRIPTION="The Aldor Programming Language" HOMEPAGE="http://pippijn.github.io/aldor; @@ -67,8 +67,11 @@ src_unpack() { } src_prepare() { + tc-export CC #should be conditional with boehm-gc - sed -i 's|-L /usr/X11/lib|-L /usr/X11/lib -lgc|' aldor/src/aldor.conf || die + sed -e 's|-L /usr/X11/lib|-L /usr/X11/lib -lgc|g' -i aldor/src/aldor.conf || die + #fix hardcoded cc + sed -e "s|cc-name\", \"cc\"|cc-name\", \"${CC}\"|g" -i aldor/subcmd/unitools/unicl.c || die default eautoreconf
[gentoo-commits] repo/proj/guru:master commit in: dev-lang/aldor/files/, dev-lang/aldor/
commit: b02deb470ac61964d463c60f334a501a883bfdcc Author: Alessandro Barbieri gmail com> AuthorDate: Thu Jul 1 23:32:35 2021 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Thu Jul 1 23:32:35 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b02deb47 dev-lang/aldor: fixes try to respect AR force boehm-gc add algebra documentation Closes: https://bugs.gentoo.org/784887 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri gmail.com> dev-lang/aldor/Manifest| 1 + ...0730.ebuild => aldor-1.2.0_p20190730-r1.ebuild} | 43 ++-- dev-lang/aldor/files/aldor-respect-ar.patch| 273 + ...spect-flags.diff => aldor-respect-cflags.patch} | 10 +- dev-lang/aldor/metadata.xml| 8 +- 5 files changed, 306 insertions(+), 29 deletions(-) diff --git a/dev-lang/aldor/Manifest b/dev-lang/aldor/Manifest index f37bff3b5..0f70afa4e 100644 --- a/dev-lang/aldor/Manifest +++ b/dev-lang/aldor/Manifest @@ -1,3 +1,4 @@ DIST aldor-1.2.0_p20190730.tar.gz 3037647 BLAKE2B 579350d9b6407506a396f42dd2408693dced58f1786cbf7b81b9ddc1b9b986f7f471b3d961c22ccbe9b7566a240de5a9af11f5cfdae1e69d25adb0fb0d1f7090 SHA512 39b1b6f9cd2e09de691c179dcce26e1d43205099f7fa9a9cd1a1ac5340fc85a616eab5887d310b5f9991e7296cfdfdf55b38cadabb7ceb7b6b135a09a5ee53d5 DIST aldor.el.nw 50217 BLAKE2B 12c822b608d995832028cc6c67126c71f05e50d941c0b22fd82fd95a1f968e64150f721982ff8e42f897811c17d2ee0b3135f5c9f57701f99bdce1f8be3fb82c SHA512 6a01873530269ff21afd494a00a8159e48e6199e9aff38259156b8ee8ce21256394629225d857d7d087fd02d1bed3d0de76812656f294f9eb322bed594f4d65e +DIST algebra.pdf 1618732 BLAKE2B baefdde2c4ece8f4e426724be1abb417a89de4f30b1a3885ab4d9bc911ab3d06bf57ab1b4f1ee04bc229957cf29d07bbd04e84473f80d359cc0d01eeb858618d SHA512 48cd108ff97fd28085c4c498a00dfba8e30736e97829f70a41ee03928bf12e3da8ff4c065ef3aa4d49689136ce54d701e6519e830941d81584f67bad13a76fea DIST libaldor.pdf.gz 434487 BLAKE2B 629dbf284db72afb98a8bc1a44df63dc0a3394fdd4361ec48a0d4811f8e931384fc257ad8f3931b7966aee25b0a015062ef8c8ab4e0ebf5978b5deda58c00ab6 SHA512 9ed1f067dd4ee11e5a440f31a9a29eb9248fcfb4349005f42c230a97190853d17e423ce677894a478644ca4964d0ba857465adfe405092c1e6512ced452eedc3 diff --git a/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild b/dev-lang/aldor/aldor-1.2.0_p20190730-r1.ebuild similarity index 79% rename from dev-lang/aldor/aldor-1.2.0_p20190730.ebuild rename to dev-lang/aldor/aldor-1.2.0_p20190730-r1.ebuild index 0fd274a7b..556184b32 100644 --- a/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild +++ b/dev-lang/aldor/aldor-1.2.0_p20190730-r1.ebuild @@ -5,29 +5,35 @@ EAPI="7" COMMIT="13e5b90eecc79ec6704efb333c4c100187520e80" -inherit autotools elisp-common java-pkg-opt-2 +inherit autotools elisp-common flag-o-matic java-pkg-opt-2 DESCRIPTION="The Aldor Programming Language" HOMEPAGE="http://pippijn.github.io/aldor; SRC_URI=" https://github.com/pippijn/aldor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz - doc? ( http://aldor.org/docs/libaldor.pdf.gz ) + doc? ( + http://aldor.org/docs/libaldor.pdf.gz + https://github.com/pippijn/aldor/files/5469932/algebra.pdf + ) emacs? ( http://hemmecke.de/aldor/aldor.el.nw ) " - +S="${WORKDIR}/${PN}-${COMMIT}/aldor" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64" -#force boehm-gc for now, without it won't build ... -IUSE="+boehm-gc doc emacs java" +IUSE="doc emacs java" -PATCHES=( "${FILESDIR}/respect-flags.diff" ) +PATCHES=( + "${FILESDIR}/${PN}-respect-cflags.patch" + "${FILESDIR}/${PN}-respect-ar.patch" +) #is junit dep. only for test? #TODO: choose a slot for junit CDEPEND=" - boehm-gc? ( dev-libs/boehm-gc ) + dev-libs/boehm-gc + emacs? ( app-editors/emacs:= ) java? ( dev-java/junit:= ) " @@ -46,8 +52,6 @@ BDEPEND=" emacs? ( app-text/noweb ) " -S="${WORKDIR}/${PN}-${COMMIT}/aldor" - DOCS=( AUTHORS README.building README.binary-only README.library ../README.md ) src_unpack() { @@ -60,7 +64,8 @@ src_unpack() { } src_prepare() { - use boehm-gc && sed -i 's|-L /usr/X11/lib|-L /usr/X11/lib -lgc|' aldor/src/aldor.conf || die + #should be conditional with boehm-gc + sed -i 's|-L /usr/X11/lib|-L /usr/X11/lib -lgc|' aldor/src/aldor.conf || die default eautoreconf @@ -68,28 +73,31 @@ src_prepare() { src_configure() { #install headers in a subfolder to avoid collisions with another packages + #force boehm-gc for now, without it won't build ... local myconf=( - --prefix="${EPREFIX}/usr" - --includedir="${EPREFIX}/usr/include/aldor" --disable-static --enable-libraries --enable-shared + --includedir="${EPREFIX}/usr/include/aldor" + --prefix="${EPREFIX}/usr" + --with-boehm-gc +
[gentoo-commits] repo/proj/guru:master commit in: dev-lang/aldor/
commit: 15385ac5fd5dd5f4c7cd6be7d8a14509b5d44bf8 Author: Alessandro Barbieri gmail com> AuthorDate: Wed May 5 07:26:04 2021 + Commit: Andrew Ammerlaan riseup net> CommitDate: Wed May 5 07:32:52 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=15385ac5 dev-lang/aldor: comaintainers welcome Signed-off-by: Alessandro Barbieri gmail.com> dev-lang/aldor/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-lang/aldor/metadata.xml b/dev-lang/aldor/metadata.xml index 907c9a5ba..3ed83d449 100644 --- a/dev-lang/aldor/metadata.xml +++ b/dev-lang/aldor/metadata.xml @@ -5,6 +5,7 @@ The Aldor language combines imperative, functional, and object-oriented features. It has an elaborate dependent type system, allowing types to be used as first-class values. Aldor's syntax is heavily influenced by Pascal, but it is optionally indentation-sensitive, like Python. In its current implementation, it is compiled, but an interactive listener is provided. + co-maintainers welcome lssndrbarbi...@gmail.com Alessandro Barbieri
[gentoo-commits] repo/proj/guru:master commit in: dev-lang/aldor/
commit: 64f962e9b6a4e1759fb1ba462a2a319a0ded6716 Author: Alessandro Barbieri gmail com> AuthorDate: Sun Apr 26 22:31:03 2020 + Commit: Andrew Ammerlaan riseup net> CommitDate: Sun Apr 26 22:39:13 2020 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=64f962e9 dev-lang/aldor: longdescription lang="en" Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Alessandro Barbieri gmail.com> dev-lang/aldor/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/aldor/metadata.xml b/dev-lang/aldor/metadata.xml index 459bf46..907c9a5 100644 --- a/dev-lang/aldor/metadata.xml +++ b/dev-lang/aldor/metadata.xml @@ -1,7 +1,7 @@ http://www.gentoo.org/dtd/metadata.dtd;> - Aldor is a programming language. It is the successor of A# as the extension language of the Axiom computer algebra system. + Aldor is a programming language. It is the successor of A# as the extension language of the Axiom computer algebra system. The Aldor language combines imperative, functional, and object-oriented features. It has an elaborate dependent type system, allowing types to be used as first-class values. Aldor's syntax is heavily influenced by Pascal, but it is optionally indentation-sensitive, like Python. In its current implementation, it is compiled, but an interactive listener is provided.
[gentoo-commits] repo/proj/guru:master commit in: dev-lang/aldor/
commit: f03f1eed33c7c21027119d25de2d40da073e48d7 Author: Alessandro Barbieri gmail com> AuthorDate: Wed Apr 8 16:46:51 2020 + Commit: Andrew Ammerlaan riseup net> CommitDate: Wed Apr 8 17:03:55 2020 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f03f1eed dev-lang/aldor: use _pre versioning schema Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Alessandro Barbieri gmail.com> dev-lang/aldor/Manifest | 2 +- .../{aldor-1.2.0_p20190730.ebuild => aldor-1.2.0_pre20190730.ebuild}| 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/aldor/Manifest b/dev-lang/aldor/Manifest index f37bff3..6007958 100644 --- a/dev-lang/aldor/Manifest +++ b/dev-lang/aldor/Manifest @@ -1,3 +1,3 @@ -DIST aldor-1.2.0_p20190730.tar.gz 3037647 BLAKE2B 579350d9b6407506a396f42dd2408693dced58f1786cbf7b81b9ddc1b9b986f7f471b3d961c22ccbe9b7566a240de5a9af11f5cfdae1e69d25adb0fb0d1f7090 SHA512 39b1b6f9cd2e09de691c179dcce26e1d43205099f7fa9a9cd1a1ac5340fc85a616eab5887d310b5f9991e7296cfdfdf55b38cadabb7ceb7b6b135a09a5ee53d5 +DIST aldor-1.2.0_pre20190730.tar.gz 3037647 BLAKE2B 579350d9b6407506a396f42dd2408693dced58f1786cbf7b81b9ddc1b9b986f7f471b3d961c22ccbe9b7566a240de5a9af11f5cfdae1e69d25adb0fb0d1f7090 SHA512 39b1b6f9cd2e09de691c179dcce26e1d43205099f7fa9a9cd1a1ac5340fc85a616eab5887d310b5f9991e7296cfdfdf55b38cadabb7ceb7b6b135a09a5ee53d5 DIST aldor.el.nw 50217 BLAKE2B 12c822b608d995832028cc6c67126c71f05e50d941c0b22fd82fd95a1f968e64150f721982ff8e42f897811c17d2ee0b3135f5c9f57701f99bdce1f8be3fb82c SHA512 6a01873530269ff21afd494a00a8159e48e6199e9aff38259156b8ee8ce21256394629225d857d7d087fd02d1bed3d0de76812656f294f9eb322bed594f4d65e DIST libaldor.pdf.gz 434487 BLAKE2B 629dbf284db72afb98a8bc1a44df63dc0a3394fdd4361ec48a0d4811f8e931384fc257ad8f3931b7966aee25b0a015062ef8c8ab4e0ebf5978b5deda58c00ab6 SHA512 9ed1f067dd4ee11e5a440f31a9a29eb9248fcfb4349005f42c230a97190853d17e423ce677894a478644ca4964d0ba857465adfe405092c1e6512ced452eedc3 diff --git a/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild b/dev-lang/aldor/aldor-1.2.0_pre20190730.ebuild similarity index 100% rename from dev-lang/aldor/aldor-1.2.0_p20190730.ebuild rename to dev-lang/aldor/aldor-1.2.0_pre20190730.ebuild
[gentoo-commits] repo/proj/guru:master commit in: dev-lang/aldor/
commit: 093682b5867d4ecab7c1f0e2ff834d6068488210 Author: Alessandro Barbieri gmail com> AuthorDate: Sun Mar 15 12:19:01 2020 + Commit: Andrew Ammerlaan riseup net> CommitDate: Wed Mar 18 09:45:10 2020 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=093682b5 dev-lang/aldor: install headers in a subfolder Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Alessandro Barbieri gmail.com> dev-lang/aldor/aldor-1.2.0_p20190730.ebuild | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild b/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild index ffecfcf..8386e04 100644 --- a/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild +++ b/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild @@ -68,7 +68,10 @@ src_prepare() { } src_configure() { + #install headers in a subfolder to avoid collisions with another packages local myconf=( + --prefix="${EPREFIX}/usr" + --includedir="${EPREFIX}/usr/include/aldor" --disable-static --enable-libraries --enable-shared @@ -81,10 +84,11 @@ src_configure() { src_compile() { if use doc ; then - ( cd "${S}/aldorug"; emake aldorug.pdf ) || die "make aldorug.pdf failed" - ( cd "${S}/lib/aldor/tutorial" - pdflatex tutorial.tex - pdflatex tutorial.tex ) || die "make tutorial.pdf failed" + cd "${S}/aldorug" + emake aldorug.pdf || die "make aldorug.pdf failed" + + cd "${S}/lib/aldor/tutorial" + pdflatex tutorial.tex || die "make tutorial.pdf failed" fi cd "${S}" if use emacs ; then @@ -93,7 +97,6 @@ src_compile() { if use doc ; then einfo "Documentation for the aldor emacs mode" noweave "aldor.el.nw" > aldor-mode.tex - pdflatex aldor-mode.tex pdflatex aldor-mode.tex || die "make aldor-mode.pdf failed" fi fi
[gentoo-commits] repo/proj/guru:master commit in: dev-lang/aldor/
commit: 2755e38779a4d6ad75a88a17bef85f92bc742b64 Author: Alessandro Barbieri gmail com> AuthorDate: Wed Mar 4 01:48:06 2020 + Commit: Andrew Ammerlaan riseup net> CommitDate: Wed Mar 4 01:48:06 2020 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2755e387 dev-lang/aldor: removed blank lines Package-Manager: Portage-2.3.91, Repoman-2.3.20 Signed-off-by: Alessandro Barbieri gmail.com> dev-lang/aldor/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/dev-lang/aldor/metadata.xml b/dev-lang/aldor/metadata.xml index fb22608..459bf46 100644 --- a/dev-lang/aldor/metadata.xml +++ b/dev-lang/aldor/metadata.xml @@ -14,7 +14,4 @@ The Aldor language combines imperative, functional, and object-oriented features Use Boehm Garbage Collector instead of built-in - - -
[gentoo-commits] repo/proj/guru:master commit in: dev-lang/aldor/files/, dev-lang/aldor/
commit: 7212ba79c230f831e617b18a4e24d4d0782fae11 Author: Alessandro Barbieri gmail com> AuthorDate: Thu Mar 5 02:06:20 2020 + Commit: Andrew Ammerlaan riseup net> CommitDate: Thu Mar 5 02:06:20 2020 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7212ba79 dev-lang/aldor: respect flags, link gc Package-Manager: Portage-2.3.91, Repoman-2.3.20 Signed-off-by: Alessandro Barbieri gmail.com> dev-lang/aldor/aldor-1.2.0_p20190730.ebuild | 10 -- dev-lang/aldor/files/respect-flags.diff | 47 + 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild b/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild index c58df7e..24016c7 100644 --- a/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild +++ b/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild @@ -20,7 +20,10 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64" -IUSE="boehm-gc doc emacs java" +#force boehm-gc for now, without it won't build ... +IUSE="+boehm-gc doc emacs java" + +PATCHES=( "${FILESDIR}/respect-flags.diff" ) #is junit dep. only for test? #TODO: choose a slot for junit @@ -58,8 +61,9 @@ src_unpack() { } src_prepare() { - #TODO: respect CFLAGS and remove Werror - eapply_user + use boehm-gc && sed -i 's|-L /usr/X11/lib|-L /usr/X11/lib -lgc|' aldor/src/aldor.conf || die + + default eautoreconf } diff --git a/dev-lang/aldor/files/respect-flags.diff b/dev-lang/aldor/files/respect-flags.diff new file mode 100644 index 000..4aec753 --- /dev/null +++ b/dev-lang/aldor/files/respect-flags.diff @@ -0,0 +1,47 @@ +diff -ur a/aldor/src/Makefile.am b/aldor/src/Makefile.am +--- a/aldor/src/Makefile.am2019-07-30 01:13:14.0 +0200 b/aldor/src/Makefile.am2020-03-04 21:14:57.582054633 +0100 +@@ -40,12 +40,12 @@ + + javagen_LDADD = libphase.a libstruct.a libgen.a libport.a -lm + javagen_LDFLAGS = +-javagen_CFLAGS = -g $(STRICTCFLAGS) ++javagen_CFLAGS = $(STRICTCFLAGS) + + showexp_SOURCES = showexports.c + showexp_LDADD = libphase.a libstruct.a libgen.a libport.a -lm + showexp_LDFLAGS = +-showexp_CFLAGS = -g $(STRICTCFLAGS) ++showexp_CFLAGS = $(STRICTCFLAGS) + + aldor_SOURCES = \ + axlcomp.c \ +@@ -53,7 +53,7 @@ + main.c + aldor_LDADD = libphase.a libstruct.a libgen.a libport.a -lm + aldor_LDFLAGS = $(build_id) +-aldor_CFLAGS = -g $(STRICTCFLAGS) ++aldor_CFLAGS = $(STRICTCFLAGS) + + #aldortest_CFLAGS = -DTEST_STAND_ALONE -DTEST_ALL -save-temps $(STRICTCFLAGS) + aldortest_CFLAGS = -DTEST_STAND_ALONE -DTEST_ALL -save-temps $(STRICTCFLAGS) +@@ -316,7 +316,6 @@ + testall_LDFLAGS = + testall_CFLAGS = -save-temps $(STRICTCFLAGS) + +-CFLAGS=-O0 -g + + # + # Special rules +diff -ur a/m4/strict_compile.m4 b/m4/strict_compile.m4 +--- a/m4/strict_compile.m4 2019-07-30 01:13:14.0 +0200 b/m4/strict_compile.m4 2020-03-04 21:17:33.394968306 +0100 +@@ -12,7 +12,7 @@ +ALDOR_CC_OPTION(-Wno-sign-compare,cfg_no_sign_compare) +AC_MSG_CHECKING(Strict options for C compiler) + +- cfgSTRICTCFLAGS="-pedantic -std=c99 -Wall -Wextra -Werror -Wno-empty-body -Wno-enum-compare \ ++ cfgSTRICTCFLAGS="-pedantic -std=c99 -Wall -Wextra -Wno-empty-body -Wno-enum-compare \ + -Wno-missing-field-initializers -Wno-unused -Wno-unused-parameter \ + -Wno-error=format -Wno-error=type-limits -Wno-error=strict-aliasing \ + $cfg_no_sign_compare $cfg_no_shift_negative_value"
[gentoo-commits] repo/proj/guru:master commit in: dev-lang/aldor/
commit: ddc30e856ca7ccaf89192d4eb5c809587a75d410 Author: Alessandro Barbieri gmail com> AuthorDate: Wed Mar 4 01:44:28 2020 + Commit: Andrew Ammerlaan riseup net> CommitDate: Wed Mar 4 01:44:28 2020 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ddc30e85 dev-lang/aldor: many changes, WIP Package-Manager: Portage-2.3.91, Repoman-2.3.20 Signed-off-by: Alessandro Barbieri gmail.com> dev-lang/aldor/aldor-1.2.0_p20190730.ebuild | 62 + dev-lang/aldor/metadata.xml | 6 +++ 2 files changed, 52 insertions(+), 16 deletions(-) diff --git a/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild b/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild index bb79cb1..e962d85 100644 --- a/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild +++ b/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild @@ -4,9 +4,8 @@ EAPI="7" COMMIT="13e5b90eecc79ec6704efb333c4c100187520e80" -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_IN_SOURCE_BUILD=1 +#TODO: figure out if a java eclass is needed inherit autotools elisp-common DESCRIPTION="The Aldor Programming Language" @@ -21,13 +20,24 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64" -IUSE="doc emacs" +IUSE="boehm-gc doc emacs java" -RDEPEND=" +#is junit dep. only for test? +#TODO: choose a slot for junit +CDEPEND=" + boehm-gc? ( dev-libs/boehm-gc ) emacs? ( app-editors/emacs:= ) + java? ( dev-java/junit ) +" +RDEPEND=" + ${CDEPEND} + java? ( virtual/jre:1.8 ) " DEPEND=" - ${RDEPEND} + ${CDEPEND} + java? ( virtual/jdk:1.8 ) +" +BDEPEND=" virtual/yacc doc? ( virtual/latex-base ) @@ -40,23 +50,42 @@ DOCS=( AUTHORS README.building README.binary-only README.library ../README.md ) src_unpack() { unpack "${P}.tar.gz" - use doc && cp "${DISTDIR}/libaldor.pdf.gz" "${S}" && gunzip "${S}/libaldor.pdf.gz" || die + if use doc ; then + cp "${DISTDIR}/libaldor.pdf.gz" "${S}" + gunzip "${S}/libaldor.pdf.gz" + fi use emacs && cp "${DISTDIR}/aldor.el.nw" "${S}" || die } +src_prepare() { + #TODO: respect CFLAGS and remove Werror + eapply_user + eautoreconf +} + +src_configure() { + local myconf=( + --disable-static + --enable-libraries + --enable-shared + $(use_enable java) + $(use_with java java-junit) + $(use_with boehm-gc) + ) + econf "${myconf[@]}" +} + src_compile() { if use doc ; then - ( cd aldorug; emake aldorug.pdf ) || die "make aldorug.pdf failed" - ( cd lib/aldor/tutorial + ( cd "${S}/aldorug"; emake aldorug.pdf ) || die "make aldorug.pdf failed" + ( cd "${S}/lib/aldor/tutorial" pdflatex tutorial.tex pdflatex tutorial.tex ) || die "make tutorial.pdf failed" - tar xzf "${DISTDIR}/algebra.html.tar.gz" fi - + cd "${S}" if use emacs ; then notangle "aldor.el.nw" > aldor.el - notangle -Rinit.el "aldor.el.nw" | \ - sed -e '1s/^.*$/;; aldor mode/' > 64aldor-gentoo.el + notangle -Rinit.el "aldor.el.nw" | sed -e '1s/^.*$/;; aldor mode/' > 64aldor-gentoo.el if use doc ; then einfo "Documentation for the aldor emacs mode" noweave "aldor.el.nw" > aldor-mode.tex @@ -64,15 +93,16 @@ src_compile() { pdflatex aldor-mode.tex || die "make aldor-mode.pdf failed" fi fi + cd "${S}" default } src_install() { - if use doc ; then - DOCS+=( aldorug/aldorug.pdf lib/aldor/tutorial/tutorial.pdf libaldor.pdf ) - fi + use doc && DOCS+=( aldorug/aldorug.pdf lib/aldor/tutorial/tutorial.pdf libaldor.pdf ) + if use emacs ; then - DOCS+=( aldor-mode.pdf ) + use doc && DOCS+=( aldor-mode.pdf ) + #TODO: rename aldor.el elisp-site-file-install aldor.el elisp-site-file-install 64aldor-gentoo.el fi diff --git a/dev-lang/aldor/metadata.xml b/dev-lang/aldor/metadata.xml index 4b9f701..fb22608 100644 --- a/dev-lang/aldor/metadata.xml +++ b/dev-lang/aldor/metadata.xml @@ -11,4 +11,10 @@ The Aldor language combines imperative, functional, and object-oriented features pippijn/aldor + + Use Boehm Garbage Collector instead of built-in + + + +