From 599d1eb5c484216eb13ce4b742cf33b5cd0c0cc5 Mon Sep 17 00:00:00 2001 From: Marco Leise Date: Wed, 23 Jan 2013 21:23:06 +0100 Subject: dev-lang/dmd: Version bump to 2.061. Keeping two previous versions in case of regressions. --- dev-lang/dmd/ChangeLog | 9 ++ dev-lang/dmd/Manifest | 10 +- dev-lang/dmd/dmd-2.058.ebuild | 167 ---------------------------- dev-lang/dmd/dmd-2.061.ebuild | 167 ++++++++++++++++++++++++++++ dev-lang/dmd/files/dmd-2.058-makefile.patch | 80 ------------- dev-lang/dmd/files/dmd-2.061-makefile.patch | 35 ++++++ 6 files changed, 216 insertions(+), 252 deletions(-) delete mode 100644 dev-lang/dmd/dmd-2.058.ebuild create mode 100644 dev-lang/dmd/dmd-2.061.ebuild delete mode 100644 dev-lang/dmd/files/dmd-2.058-makefile.patch create mode 100644 dev-lang/dmd/files/dmd-2.061-makefile.patch (limited to 'dev-lang/dmd') diff --git a/dev-lang/dmd/ChangeLog b/dev-lang/dmd/ChangeLog index 5963881ee..40681472d 100644 --- a/dev-lang/dmd/ChangeLog +++ b/dev-lang/dmd/ChangeLog @@ -2,6 +2,15 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*dmd-2.061 (23 Jan 2013) + + 23 Jan 2013; Marco Leise (mleise) -dmd-2.058.ebuild, + -files/dmd-2.058-makefile.patch, +dmd-2.061.ebuild, + +files/dmd-2.061-makefile.patch: + Version bump to 2.061. Keeping two previous versions in case of regressions. + +*dmd-2.060 (12 Jan 2013) + 12 Jan 2013; Thomas Sachau (Tommy[D]) dmd-2.060.ebuild: USE mirror:// instead of direct URL diff --git a/dev-lang/dmd/Manifest b/dev-lang/dmd/Manifest index 3424652b1..4ba8511a1 100644 --- a/dev-lang/dmd/Manifest +++ b/dev-lang/dmd/Manifest @@ -4,19 +4,19 @@ AUX 2.059-issue-7922.patch 6229 SHA256 82c387f6321329a4763c689114d32e09ee9d0f4e9 AUX 2.059-outOfMemoryError-undeprecation.patch 553 SHA256 6b36b490cce2a9bc72a28adaf85887f30cb26999189e1c84e32d68820e72713a SHA512 5d538f1dc1da0a3f3919f9dc7f5f02465cd0cd38f2b1339a53cea8f882c7041e4ef37b08ffb14563ab2e20cae0fabd8b76dd59434a8acf105ce3c752db7f0405 WHIRLPOOL 30c7425274b813d76886e0c343be40fc7721807089f76f3ce56c512d1a3cde1b50f28bb8642688c18d9e6d18b9b1592fe07e957c67577bab220f40cd74268aac AUX 2.059-std-path-sep-deprecation.patch 1378 SHA256 b196c8a274bb5bd9268311fa6bdd14ecf3c42cd711ef12f016d3addff4ab980b SHA512 1239ffc0aca873eb20fb094a34cc47237f6702c9daf6955dd47df0b7920270b4460ab96c499e653a1244394385a9231fd86b74d5362d75546e0250083783991f WHIRLPOOL f7ef554f74f6e5d51be6a51405e8ef5f26c50fc6f3f84270c7e3d7f39217916d72666b6307fa605417920e1b148ec94ac321e465e89662ba92577e9ed8a7c12e AUX dmd-1.066-makefile.patch 16530 SHA256 df0c6db1578747b9cc5bbc9ccb14ab53599d7e2456d68f60d40ee98daa61dbb6 SHA512 4426b2acd6861418617d513d1809b6c79d2cba0c899b6bd5d233ea3a54894af8851fa06bb52607823ca4f7dcbb958e14057ff8e20d9eb686b99eff582e85fe63 WHIRLPOOL 29a6e32f13545e4aa6219462467327d980a63a0921288d4bdc45e3af7cd8c7875b10cc388a8f6dedb207fbd27ec3569bddc6402d4cf5acf3bd176021a670c732 -AUX dmd-2.058-makefile.patch 1843 SHA256 e8cb107bd1943950f077c696275e01920b1f0351ebcf1734f7dc862eb3392a9c SHA512 17b56c3d44d0a7c91105d2ea496f798b78ab1361ba790fbf7e64af0993a6906e7497719d8a9ef905fe2bc20904922eca17cb52443b75faab5a5f8050d3c3c0e2 WHIRLPOOL 4cd92627a92d6df2fdb9ebd39c711a1e49214c3a1a3ebd73811584a54e200afc0868fb25b8cbfb71d6fdb21dd95ec15bb7ed6d3953e2d5117aa52aab71795310 AUX dmd-2.059-makefile.patch 1843 SHA256 e8cb107bd1943950f077c696275e01920b1f0351ebcf1734f7dc862eb3392a9c SHA512 17b56c3d44d0a7c91105d2ea496f798b78ab1361ba790fbf7e64af0993a6906e7497719d8a9ef905fe2bc20904922eca17cb52443b75faab5a5f8050d3c3c0e2 WHIRLPOOL 4cd92627a92d6df2fdb9ebd39c711a1e49214c3a1a3ebd73811584a54e200afc0868fb25b8cbfb71d6fdb21dd95ec15bb7ed6d3953e2d5117aa52aab71795310 AUX dmd-2.060-makefile.patch 782 SHA256 973b43d90be6d801254c7c07fb1cf57f790214d2bfab37e159e0026d21d0ff4e SHA512 d91c3c6856cf59cf1e930d153ee91ff5c6c680497a04d1ef169ffb28137b58ef721aaed1f9913c0f455716797e4e93f17f7b8ac3fb69658f8e0b1026ccf539e2 WHIRLPOOL d05c628261d95f08ec36cffd0af82d00f8422f58eb7dc67a5e37402c7834daa40cda82d3376cc181480caf14f47bcee1dd840d082e6856c58b6879f7492d5422 +AUX dmd-2.061-makefile.patch 767 SHA256 2f6f2743dc3665e27d90b1f5c0f347fa55b8a4b7f9d6c17de701f48c549a4b62 SHA512 980b43e8ff60f8849a5aa0f0429331336820d6b45c5864ffd0f09db341c4016b984121e082d32c59a5979d36acaaf563bc4f763330a0335a8b3bd321a54b698f WHIRLPOOL 3e3ed997eabb89414b739f55f7b8b24aa6b89d3aa0fc7475d8490c10edbfc1a61f13a01d4a9269addc5b08fa1bba8589c02180f8c5c45c6ab3ddf937f7d5bc78 AUX dmd.bashcomp 4486 SHA256 b679b0c676035eda48948eeb6c2a8184c6effdc97d8c98d1ca4b071f345e4ac6 SHA512 b54fd8b457be79d923bd7eacd4c98a5e5840a11b71a562c426bf60814ae0438123693e3295e35c1dbf1585b2568125209368fd0bf590b19addd963c5fde25f22 WHIRLPOOL 1fc1e2776813156798c298c28a7d5c6c0d46dd39bdce0fce00573a8f42ff2d99b3eeaea0eff28f9dc3663c61d67fe6b43b5550021093afd8b7d49ffc705ac815 AUX slot-compat.patch 376 SHA256 d9f1f19b158c3cc52e133751e834460b12a0fa003192d50ba40421bf9ff56763 SHA512 d49c8768fc9c5169086e495c7fc93678747059e84ec6a6d105b11426f1d3b05ce0bc9a372d41960dd878274ce2ebf22b6ba6066be276b98ed728b5e46b1ed099 WHIRLPOOL d431e306e66e53fdf089d933ed9d42337e12805927b6e56641037d29d5566f6ce15f6d8439edd76b43b4158974d8bd96f35cd5ad1a254b7ce8e87863ca52c208 AUX stackelf.patch 3527 SHA256 56835f1bb5b5f33edbb2bdf650bdb9e459f3670db205b2aeb0a367a868517a96 SHA512 62de8d7427bd05b77eaea14769dfa94621365b3b62e8126341d50c7fef89fd7552946c0bfb4c9fcccdb26f66deb2787b68fe56849b0d694b45007a84bec84a76 WHIRLPOOL 40925f60883ad2f736b6398da6253cd674590c9ef3cd7bce2d510e8f3e795db48ffa64b5ef0fe85562716dd633136eab55ec59f3fdc2f2aad76c3f702a94c8f3 DIST dmd.1.066.zip 8958349 SHA256 26c421fdeaa3f81397cb9be858b8829eb01ebe11d6874c133b2ba2de249775fb -DIST dmd.2.058.zip 26266462 SHA256 3bbfebf8d1288f6a6f021814680e77f0287fff45436dfe8e86117371d5557fea DIST dmd.2.059.zip 26217241 SHA256 47c712f9c47e0ac156362dfbd5e90f6ed63eb6ffbd0cc96c7db3f9d48ccd9a50 -DIST dmd.2.060.zip 26819944 SHA256 8da5b46e34e476c29155eff8507aa7a6a82545b1e236f27bad2b6613d2165498 +DIST dmd.2.060.zip 26819944 SHA256 8da5b46e34e476c29155eff8507aa7a6a82545b1e236f27bad2b6613d2165498 SHA512 fa92ca034d37f753c8cf9ffe281108bbd5df0a4385a2d2bf1a7f191d7fc2ca4de442d6d71f760fcbc949510dc6b82b198c4516db10315ad62ffe22056f8a4af2 WHIRLPOOL af485b084b32806ddf7528dc6e74dbd211bca78f05d91c548fe912fdf6be11467c49b5b21304438d12636ef2502d9d7db7d0733d60c13a3dd748a6ac569cfbd2 +DIST dmd.2.061.zip 31601020 SHA256 13b546b69d628280f245ab19bf4ed27ab66a0085afdaf950e075e68acc7f4c93 SHA512 e1b68c1c73158a0ff792624f5e1dbb7e40c70a149071a5649965125239ab12b3da8a90cf3ccd618a8ef5554a9bbeb1a848246004e1f17cf7f81fd229f44b190b WHIRLPOOL b9a663501176de646414df443e173404d40de2c75080e57ea1b0fb224cc8b14673dd91f11e4046867b309070d169eed9a7002ec55265e10fb5487fd4f72a098a EBUILD dmd-1.066.ebuild 2252 SHA256 bc8776c7523f3b513b5879939d47261585b9af73271aa9fc3af1adeb8c5cd42f SHA512 a8c494be8f03828e6894fbd1bb6c34b5e9943e0ec7d818de9a1dd3a68e28d911296a4877d2801bed3d688f5275e7c4d6f1be8f3dc9c12dd1a1b5cc20197468de WHIRLPOOL c5fcaa96b2355884d39285524ecf6820ff44c114f66c38b1e2533ce7762653eda72400056bced547c3f8f1ca08e471d8cda1138f1623c2a44eb634266be3a65c -EBUILD dmd-2.058.ebuild 4367 SHA256 779496298f67daf17f395efe8aff371bd44b445da9e99d04cd0018c3589311c6 SHA512 4db873bb8b3683ee3756b52365817efedad6c75fb0c23b9fb047becb1138ecff7dbf48cccbc958df954f42acf38ee59deaf2d925add09c982bc1dd6c16d98839 WHIRLPOOL 64c60b6c2606b8c3f31e70e8e9d863f4926a38f42afe7076f9965598a99384681aa886b233f9f490897a1668a7258a5c5073ef06e9e5f013cd7417fbea72347c EBUILD dmd-2.059.ebuild 4626 SHA256 1229163a4e578785566412214396637a68b00bc42e44f5d92b59db39ec56b0c7 SHA512 449f1c8769a3b7d5b97b245d92bca3fabaf03975d8ba710a8821fbacb8e7872a7de01c5225a255427b8d32b519bd6d7b9363789063dedea77ee38dfa114f477d WHIRLPOOL c1b4ddf0db5744fab4143dcaac0ff79f538a809f26df8d0e44705cbd7093ac8c8c2a07b9437496658da2bb7097ed28c0de6ee40254e8b9a747b32a6e4ece7d12 EBUILD dmd-2.060.ebuild 4371 SHA256 573d7a07e233f1085c0967077cf4e674cff9c87fc3049111aae9723b1b73e5ce SHA512 9a7b743d5ca7e3d9ac2986b69f7ab80baee9a3b761bbd9e60566a63d189a6330eafd9eadfe6b15305bb13137ce5d4748d43ab53346400dcb02ecf7e8e09b4282 WHIRLPOOL 5d3899ac8cedd78eed124b9e39b8d6454465c1674dcde3626e17e4d6ed75cc9734ec1da122685bf4081eae7a91298aef53b01ab53c3852765c3f3956e3c4a7f4 -MISC ChangeLog 2799 SHA256 1388324d3a75dcbae7bd82056015c9ff09e6abf1d2fed617582f9ab251210816 SHA512 0587133f6078aa89abc5174edf81956d736d3d3c9d765663e231c7cc98a33e254f72cb5dc2c413f3bd1a82d53f7ccb5a4795da48cccc0f4d2163cd536fd6b384 WHIRLPOOL 0440728fbd76617cd827f22a90c28be11e8c45ed470676bf31c4ef8828bb76cbf87d36a47087454451a7d1cc2ac3a4427ff698df36955229ce196ba14167d516 +EBUILD dmd-2.061.ebuild 4409 SHA256 990e51c0d857dac36118012730ca4b7b0af214656c090002f73fea06434a8c6c SHA512 89e47ae30477d3ae386ccb7baf3610f375dbe653782d20de264da53bd28441c5f42f6d939d616eb1631ec28b506f4da7088d44040012d697f61c56c9172621cf WHIRLPOOL 71513c3966ce9885e6ddec0179790f79120916e5ffd8b27b7533f657ec20cf9cb04980407b063f35daa4000d0143e7785fd2a9747176c8572eb3b2d957cf7dee +MISC ChangeLog 3096 SHA256 006c973278c44206e4836f4d3cc28ff2a9c979f68fe054ff16bf6e9564d044f7 SHA512 d8986f6dfe85d076c08bfe4b78dd785cc22d54b44ae7608d92bdd567de9be70b6a1996f319dd1aede9d57784be4558b5337a708101370f3e1ee0dceedc857a39 WHIRLPOOL 4e1e697a9c1973d544ddfa15b1aa74b5de1ec3a1d478695446a1da0f928f505142fef642e268ab812f912f039a6d02ebb76c8538072737cb6afe73e7f9d64d78 MISC metadata.xml 377 SHA256 5edc28143917c389d89a0af6623313c5f7ef81bf55dba92b39c611014fa6ed9e SHA512 c859bd7805b4a42bfbc5418e151638b63fe08e74e76722f2f95f20702549ded7b06058ce893ae22bd490d8c591e0c41e5dea3c24f46cb3f85463bb75096accba WHIRLPOOL 39e25417c4b28c27d16380faf4ac1d037e3576e6966715ef0dbc3737bc8a7f4c84c1234544fcab3e325766475df63594c7d09c10ec351e47c7559bee85aaa4be diff --git a/dev-lang/dmd/dmd-2.058.ebuild b/dev-lang/dmd/dmd-2.058.ebuild deleted file mode 100644 index c9ae4f769..000000000 --- a/dev-lang/dmd/dmd-2.058.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" - -inherit eutils multilib bash-completion-r1 - -DESCRIPTION="Reference compiler for the D programming language" -HOMEPAGE="http://www.digitalmars.com/d/" -SRC_URI="http://ftp.digitalmars.com/${PN}.${PV}.zip" - -# DMD supports amd64/x86 exclusively -KEYWORDS="-* ~amd64 ~x86" -SLOT="2" -IUSE="multilib doc examples tools" - -# License doesn't allow redistribution -LICENSE="DMD" -RESTRICT="mirror" - -DEPEND="sys-apps/findutils - app-arch/unzip" -RDEPEND="!dev-lang/dmd-bin" - -S="${WORKDIR}/${PN}2/src" - -rdos2unix() { - edos2unix $(find . -name '*'.$1 -type f) || die "Failed to convert line-endings of all .$1 files" -} - -src_prepare() { - cd .. || die - - rm -r README.TXT windows freebsd osx linux/{lib32,lib64} \ - linux/{bin32,bin64}/{README.TXT,dmd,dmd.conf} \ - || die "Failed to remove included binaries" - - # convert line-endings of file-types that start as cr-lf and are - # patched or installed later on - rdos2unix c - rdos2unix d - rdos2unix txt - rdos2unix css - - # misc patches for the build process - epatch "${FILESDIR}/${P}-makefile.patch" -} - -src_compile() { - # DMD - ln -s . "dmd/mars" || die "Failed to add recursive symbolic link to DMD sources." - if use x86; then - einfo 'Building DMD for x86 ...' - emake -C dmd -f posix.mak MODEL=32 - elif use amd64; then - einfo 'Building DMD for amd64 ...' - emake -C dmd -f posix.mak MODEL=64 - fi - - # druntime & Phobos - if use x86 || (use amd64 && use multilib); then - einfo 'Building druntime for x86 ...' - emake -C druntime -f posix.mak MODEL=32 "DMD=../dmd/dmd" - einfo 'Building Phobos for x86 ...' - emake -C phobos -f posix.mak MODEL=32 "DMD=../dmd/dmd" - fi - if use amd64; then - einfo 'Building druntime for amd64 ...' - emake -C druntime -f posix.mak MODEL=64 "DMD=../dmd/dmd" - einfo 'Building Phobos for amd64 ...' - emake -C phobos -f posix.mak MODEL=64 "DMD=../dmd/dmd" - fi -} - -src_test() { - local DFLAGS="-Iphobos -Idruntime/import -L-lrt" - local DMD="dmd/dmd" - if use x86 || (use amd64 && use multilib); then - ${DMD} -m32 ${DFLAGS} -Lphobos/generated/linux/release32/libphobos2.a ../samples/d/hello.d || die "Failed to build hello.d (32bit)" - ./hello 32bit || die "Failed to run test sample (32bit)" - fi - if use amd64; then - ${DMD} -m64 ${DFLAGS} -Lphobos/generated/linux/release64/libphobos2.a ../samples/d/hello.d || die "Failed to build hello.d (64bit)" - ./hello 64bit || die "Failed to run test sample (64bit)" - fi - rm hello.o hello -} - -src_install() { - # prepeare and install config - cd "dmd" || die - cat > dmd.conf << EOF -[Environment] -DFLAGS=-I/usr/include/phobos2 -I/usr/include/druntime -L--no-warn-search-mismatch -L--export-dynamic -L-lrt -EOF - insinto /etc - doins dmd.conf - dobashcomp "${FILESDIR}/${PN}.bashcomp" - - # Compiler - dobin "dmd" - - # Man pages, docs and samples - cd ".." || die - doman ../man/man1/dmd.1 - doman ../man/man1/dmd.conf.5 - - use doc && dohtml -r ../html/* - - if use tools; then - doman ../man/man1/dumpobj.1 - doman ../man/man1/obj2asm.1 - doman ../man/man1/rdmd.1 - - # Bundled pre-compiled tools - if use amd64; then - dobin ../linux/bin64/{dumpobj,obj2asm,rdmd} - fi - if use x86; then - dobin ../linux/bin32/{dumpobj,obj2asm,rdmd} - fi - fi - - docompress -x /usr/share/doc/${PF}/samples/ - insinto /usr/share/doc/${PF}/samples/ - if use examples; then - doins -r ../samples/d/* - fi - - # druntime & Phobos - if use amd64; then - newlib.a "druntime/lib/libdruntime-linux64.a" "libdruntime.a" - dolib.a "phobos/generated/linux/release/64/libphobos2.a" - fi - if use x86 || (use amd64 && use multilib); then - use amd64 && multilib_toolchain_setup x86 - newlib.a "druntime/lib/libdruntime-linux32.a" "libdruntime.a" - dolib.a "phobos/generated/linux/release/32/libphobos2.a" - # TODO: restore target architecture - fi - - # cleanup builds - rm -r "druntime/obj" "druntime/lib" || die - rm -r "phobos/generated" || die - - # remove files that are not required - rm "phobos/posix.mak" || die - rm "phobos/win32.mak" || die - rm "phobos/std.ddoc" || die - rm "phobos/index.d" || die - rm -r "phobos/etc/c/zlib" || die - - # imports - insinto /usr/include/druntime/ - doins -r druntime/import/* - - insinto /usr/include/phobos2 - doins -r phobos/* -} - -pkg_postinst() { - if use doc || use examples; then - elog "The bundled docs and/or samples may be found in" - elog "/usr/share/doc/${PF}" - fi -} diff --git a/dev-lang/dmd/dmd-2.061.ebuild b/dev-lang/dmd/dmd-2.061.ebuild new file mode 100644 index 000000000..05c414e41 --- /dev/null +++ b/dev-lang/dmd/dmd-2.061.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" + +inherit eutils multilib bash-completion-r1 + +DESCRIPTION="Reference compiler for the D programming language" +HOMEPAGE="http://dlang.org/" +SRC_URI="http://downloads.dlang.org.s3.amazonaws.com/releases/2013/${PN}.${PV}.zip" + +# DMD supports amd64/x86 exclusively +KEYWORDS="-* ~amd64 ~x86" +SLOT="2" +IUSE="multilib doc examples tools" + +# License doesn't allow redistribution +LICENSE="DMD" +RESTRICT="mirror" + +DEPEND="sys-apps/findutils + app-arch/unzip" +RDEPEND="!dev-lang/dmd-bin" + +S="${WORKDIR}/${PN}2/src" + +rdos2unix() { + edos2unix $(find . -name '*'.$1 -type f) || die "Failed to convert line-endings of all .$1 files" +} + +src_prepare() { + cd .. || die + + rm -r README.TXT windows freebsd osx linux/{lib32,lib64} \ + linux/{bin32,bin64}/{README.TXT,dmd,dmd.conf} \ + || die "Failed to remove included binaries" + + # convert line-endings of file-types that start as cr-lf and are + # patched or installed later on + rdos2unix c + rdos2unix d + rdos2unix txt + rdos2unix css + + # misc patches for the build process + epatch "${FILESDIR}/${P}-makefile.patch" +} + +src_compile() { + # DMD + ln -s . "dmd/mars" || die "Failed to add recursive symbolic link to DMD sources." + if use x86; then + einfo 'Building DMD for x86 ...' + emake -C dmd -f posix.mak MODEL=32 + elif use amd64; then + einfo 'Building DMD for amd64 ...' + emake -C dmd -f posix.mak MODEL=64 + fi + + # druntime & Phobos + if use x86 || (use amd64 && use multilib); then + einfo 'Building druntime for x86 ...' + emake -C druntime -f posix.mak MODEL=32 "DMD=../dmd/dmd" + einfo 'Building Phobos for x86 ...' + emake -C phobos -f posix.mak MODEL=32 "DMD=../dmd/dmd" + fi + if use amd64; then + einfo 'Building druntime for amd64 ...' + emake -C druntime -f posix.mak MODEL=64 "DMD=../dmd/dmd" + einfo 'Building Phobos for amd64 ...' + emake -C phobos -f posix.mak MODEL=64 "DMD=../dmd/dmd" + fi +} + +src_test() { + local DFLAGS="-Iphobos -Idruntime/import -L-lrt" + local DMD="dmd/dmd" + if use x86 || (use amd64 && use multilib); then + ${DMD} -m32 ${DFLAGS} -Lphobos/generated/linux/release32/libphobos2.a ../samples/d/hello.d || die "Failed to build hello.d (32bit)" + ./hello 32bit || die "Failed to run test sample (32bit)" + fi + if use amd64; then + ${DMD} -m64 ${DFLAGS} -Lphobos/generated/linux/release64/libphobos2.a ../samples/d/hello.d || die "Failed to build hello.d (64bit)" + ./hello 64bit || die "Failed to run test sample (64bit)" + fi + rm hello.o hello +} + +src_install() { + # prepeare and install config + cd "dmd" || die + cat > dmd.conf << EOF +[Environment] +DFLAGS=-I/usr/include/phobos2 -I/usr/include/druntime -L--no-warn-search-mismatch -L--export-dynamic +EOF + insinto /etc + doins dmd.conf + dobashcomp "${FILESDIR}/${PN}.bashcomp" + + # Compiler + dobin "dmd" + + # Man pages, docs and samples + cd ".." || die + doman ../man/man1/dmd.1 + doman ../man/man1/dmd.conf.5 + + use doc && dohtml -r ../html/* + + if use tools; then + doman ../man/man1/dumpobj.1 + doman ../man/man1/obj2asm.1 + doman ../man/man1/rdmd.1 + + # Bundled pre-compiled tools + if use amd64; then + dobin ../linux/bin64/{ddemangle,dman,dumpobj,obj2asm,rdmd} + fi + if use x86; then + dobin ../linux/bin32/{ddemangle,dman,dumpobj,obj2asm,rdmd} + fi + fi + + docompress -x /usr/share/doc/${PF}/samples/ + insinto /usr/share/doc/${PF}/samples/ + if use examples; then + doins -r ../samples/d/* + fi + + # druntime & Phobos + if use amd64; then + newlib.a "druntime/lib/libdruntime-linux64.a" "libdruntime.a" + dolib.a "phobos/generated/linux/release/64/libphobos2.a" + fi + if use x86 || (use amd64 && use multilib); then + use amd64 && multilib_toolchain_setup x86 + newlib.a "druntime/lib/libdruntime-linux32.a" "libdruntime.a" + dolib.a "phobos/generated/linux/release/32/libphobos2.a" + # TODO: restore target architecture + fi + + # cleanup builds + rm -r "druntime/obj" "druntime/lib" || die + rm -r "phobos/generated" || die + + # remove files that are not required + rm "phobos/posix.mak" || die + rm "phobos/win32.mak" || die + rm "phobos/std.ddoc" || die + rm "phobos/index.d" || die + rm -r "phobos/etc/c/zlib" || die + + # imports + insinto /usr/include/druntime/ + doins -r druntime/import/* + + insinto /usr/include/phobos2 + doins -r phobos/* +} + +pkg_postinst() { + if use doc || use examples; then + elog "The bundled docs and/or samples may be found in" + elog "/usr/share/doc/${PF}" + fi +} diff --git a/dev-lang/dmd/files/dmd-2.058-makefile.patch b/dev-lang/dmd/files/dmd-2.058-makefile.patch deleted file mode 100644 index 0505f48eb..000000000 --- a/dev-lang/dmd/files/dmd-2.058-makefile.patch +++ /dev/null @@ -1,80 +0,0 @@ -The patches allow for MODEL, DMD (compiler for the library) and -DDOC (documentation generator) to be overriden on the command line. -The patch to gzio.c adds the missing errno.h include, to make the code portable: -http://d.puremagic.com/issues/show_bug.cgi?id=5463 ---- dmd2/src/dmd/posix.mak -+++ dmd2/src/dmd/posix.mak -@@ -29,7 +29,7 @@ - TK=tk - ROOT=root - --MODEL=32 -+MODEL?=32 - - ifeq (OSX,$(TARGET)) - ## See: http://developer.apple.com/documentation/developertools/conceptual/cross_development/Using/chapter_3_section_2.html#//apple_ref/doc/uid/20002000-1114311-BABGCAAB ---- dmd2/src/druntime/posix.mak -+++ dmd2/src/druntime/posix.mak -@@ -20,12 +20,12 @@ - endif - endif - --DMD=dmd -+DMD?=dmd - - DOCDIR=doc - IMPDIR=import - --MODEL=32 -+MODEL?=32 - - DFLAGS=-m$(MODEL) -O -release -inline -nofloat -w -d -Isrc -Iimport -property - UDFLAGS=-m$(MODEL) -O -release -nofloat -w -d -Isrc -Iimport -property ---- dmd2/src/phobos/etc/c/zlib/gzio.c -+++ dmd2/src/phobos/etc/c/zlib/gzio.c -@@ -8,6 +8,7 @@ - /* @(#) $Id$ */ - - #include -+#include - - #include "zutil.h" - ---- dmd2/src/phobos/posix.mak -+++ dmd2/src/phobos/posix.mak -@@ -61,8 +61,6 @@ - - # Variable defined in an OS-dependent manner (see below) - CC = --DMD = --DDOC = - CFLAGS = - DFLAGS = - -@@ -83,14 +81,14 @@ - # Set CC and DMD - ifeq ($(OS),win32wine) - CC = wine dmc.exe -- DMD = wine dmd.exe -+ DMD ?= wine dmd.exe - RUN = wine - else - ifeq ($(OS),win32remote) -- DMD = ssh 206.125.170.138 "cd code/dmd/phobos && dmd" -+ DMD ?= ssh 206.125.170.138 "cd code/dmd/phobos && dmd" - CC = ssh 206.125.170.138 "cd code/dmd/phobos && dmc" - else -- DMD = dmd -+ DMD ?= dmd - ifeq ($(OS),win32) - CC = dmc - else -@@ -141,7 +139,7 @@ - endif - - # Set DDOC, the documentation generator --DDOC=$(DMD) -+DDOC?=$(DMD) - - # Set LIB, the ultimate target - ifeq (,$(findstring win,$(OS))) diff --git a/dev-lang/dmd/files/dmd-2.061-makefile.patch b/dev-lang/dmd/files/dmd-2.061-makefile.patch new file mode 100644 index 000000000..50f6a7e2e --- /dev/null +++ b/dev-lang/dmd/files/dmd-2.061-makefile.patch @@ -0,0 +1,35 @@ +The patches allow for MODEL, DMD (compiler for the library) and +DDOC (documentation generator) to be overriden on the command line. +--- dmd2/src/dmd/posix.mak ++++ dmd2/src/dmd/posix.mak +@@ -49,7 +49,7 @@ + TK=tk + ROOT=root + +-MODEL=32 ++MODEL?=32 + ifneq (x,x$(MODEL)) + MODEL_FLAG=-m$(MODEL) + endif +--- dmd2/src/druntime/posix.mak ++++ dmd2/src/druntime/posix.mak +@@ -37,7 +37,7 @@ + DOCDIR=doc + IMPDIR=import + +-MODEL=32 ++MODEL?=32 + override PIC:=$(if $(PIC),-fPIC,) + + DFLAGS=-m$(MODEL) -O -release -inline -w -Isrc -Iimport -property $(PIC) +--- dmd2/src/phobos/posix.mak ++++ dmd2/src/phobos/posix.mak +@@ -149,7 +149,7 @@ + endif + + # Set DDOC, the documentation generator +-DDOC=$(DMD) ++DDOC?=$(DMD) + + # Set LIB, the ultimate target + ifeq (,$(findstring win,$(OS))) -- cgit v1.2.3-65-gdbad