diff options
Diffstat (limited to 'dev-lisp')
| -rw-r--r-- | dev-lisp/Manifest.gz | bin | 3376 -> 3380 bytes | |||
| -rw-r--r-- | dev-lisp/sbcl/Manifest | 11 | ||||
| -rw-r--r-- | dev-lisp/sbcl/files/build-id-2.3.6.patch | 12 | ||||
| -rw-r--r-- | dev-lisp/sbcl/metadata.xml | 1 | ||||
| -rw-r--r-- | dev-lisp/sbcl/sbcl-2.3.7.ebuild (renamed from dev-lisp/sbcl/sbcl-2.2.9.ebuild) | 71 |
5 files changed, 64 insertions, 31 deletions
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz Binary files differindex 6878ebac4ad2..8c785d8e1a09 100644 --- a/dev-lisp/Manifest.gz +++ b/dev-lisp/Manifest.gz diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest index 5c946a3169f8..87b7d8cc3c50 100644 --- a/dev-lisp/sbcl/Manifest +++ b/dev-lisp/sbcl/Manifest @@ -1,8 +1,8 @@ +AUX build-id-2.3.6.patch 510 BLAKE2B f3a7b61eb9f72cfa21ae86186b7848ab74aea82df84b97b8be2d4dee765a13aefd9c8437c50d20bfe82658f754cf8a455a4ef1e972312a9b13dc01a8871c9465 SHA512 47bd8ed93fbb1f760464b987173eddf70670afdc24ae46ccde19077aba982378de0174907def40b14b0f39ca4c11e6cef6c03bd60a07e5686fc42587a95c5ce2 AUX concurrency-test-2.0.1.patch 587 BLAKE2B 3c7f73f7efe711f400f830cbd53b6448aeba41e14f4b229b0260d62c494ffdf9ef9687d916aa108035b53065598a8a51c92e086509b2cdabb2f6b2a7acb0b718 SHA512 c1223eda1a6e9e40196bc133a6270c9803195257d39637d4622026503774847eb184879025d9029617e8b36074d81c47820c4474ceabcb45b7734deddeeae8ce AUX etags-2.1.0.patch 347 BLAKE2B 00e55c6b2279bfe8171de31a92a8c2afd4bc13eb2364aadb4f7850bc6078fabdefa21bd238c1d2b9914818b0fff81ad26ed0f1878cbec3f2b2e3fc13518cf908 SHA512 724e97da71176769a78e1eae017d6d9efcf3add4707947d9d2700837b596b7b4f675bfc40e2be35d8be61cb67ac273fdf810ce5b1489202fbdc9be6125fa3a0f AUX sb-posix-test-2.2.9.patch 1303 BLAKE2B 413020d95c80b2a973897f4ba104cabff642c86a1594c9f265a2f5ce9acd662f003ce5ce194091480181262954d64016351d33af7943e8a81ebe11d2bb57ec34 SHA512 83b196051f5f06014d9e0f02f70258852a2872a2cfc24ea3d2bc06a9657635692c613f268b84da4c5ba1a416c5b3ba4a0bf8d007d3b88a1fba1a3bfda7f621d5 AUX verbose-build-2.0.3.patch 1014 BLAKE2B bdd83275e874ad0835caba34f4b97ae16d2537ccb0650aac12f874dc9344fa4b8dd56468ef8c45cca2fe570fff25026f636b2cae294116a23f9bde6523cb9efa SHA512 01b0259d8d19b5c5554bcee54756b60986d623467e3156f4ece3f0ede5d64ec75688d3ac8a41a33e55e3f80c96c3f9184e6ec208621e33fb18397e6f575d4b84 -DIST bsd-sockets-test-2.0.5.patch.gz 3189 BLAKE2B ba4d8af4ae5f3f7e4008632c6603fb74e2419da5f9cf0ccf24c9f2440896fb466332dfa55652f6848f25e0eea76cd696556df0e6d88d0bcb73fcbc8db102ef90 SHA512 2e60db09f435f0f5630aa56a0af208a5b24a27b7c072c17e6a49525ed99d5ed7cdbd78e11511d1dc9b23e14ddca9f9592f625ec33cf98f066151de02565b86ae DIST bsd-sockets-test-2.3.1.patch.gz 3451 BLAKE2B 3f1499df0346852d3337d741e4f2e99dddc178f8f31d79911ba3206a83f0d56ad86967ed4deccc7c28a3e24e302814db63a1fafe3b88991cfba7a1c40c8b3851 SHA512 bccf0d4a46b6fcfea40a287863e72267717fa6860d8dc3e3e0bd4f616d9b825eec1195f4e88b0650c12c76360e2fc3c7e32930c0319ecae0ab66834be22fca83 DIST bsd-sockets-test-2.3.6.patch.gz 3459 BLAKE2B f8ee83904a21944f15890c781aa46f66e0e5c5f59b5c03ba78b54fc8c1d4b1d88cae71bbb6f3f88451435eb7a3ab39a7168df047d9684391b46afc644dc9e96c SHA512 baaf803210c00074042d04e12e47919e8e187c8ae3374651a4205aded9d10bec078e5e17e04fcdcb666ab3f4bb1d7195c453b0f1d8b1fc5038e1ac22bf99ca35 DIST sbcl-1.0.28-alpha-linux-binary.tar.bz2 7573824 BLAKE2B ab8e139adb4fbc0ac7b34457c3361b044d04d8d9dedba2008cb19220915900e2d1bf540b617c738145923d74fa28ab7d979fd0d1bf4b9d17c445dfb080731263 SHA512 85ceb4d3bf971777f5444a63cbabd88ccfaf16ed3b3c86cc5ea6cb3fd3189c4cd5a5ebbf785c97366afb7026604ffc34a1129936291deede5993056e158125ab @@ -11,18 +11,17 @@ DIST sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 8217590 BLAKE2B 68da614df7d27ecf0 DIST sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 10038928 BLAKE2B b434f65e9e42341645ac91c8f35ffeb6d2d7f043544ca9af7c519a46df15cee6d2fe4d0a56c10643c6f263e8deb75bcfb00cc399d1f32c10d53c20a9842c45db SHA512 c271796f854fe884e0d8aa6504bbe2e6c078de1555fc9a823463640cfd8c793dbddcb3f32932788d84a41e2b8a085b95c97c13a15c43fc909dcaad18ce25f215 DIST sbcl-1.2.7-powerpc-linux-binary.tar.bz2 9884585 BLAKE2B 1870da882fc5e466eaf5e96ed46aed600660bdfe836eabe145cf9ea4713e537a7d45dd76538d899801d0e3ea944c4ccfff1c9688fc695890bb4cac69135ef046 SHA512 7b9fef12d3d6397adec6a0c26d1431a18b8d91b5bf009034eb2501de9fd60dc04dd2e3cd2d9feb9204d4631360aea88ba07a9ad75dad0767b5dcc5e62e84e790 DIST sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 10438955 BLAKE2B ca9cd3a55873c648940793ae9fb92dde5e4569b7392932771b31dc71da380267556b3ceb8b099f62576b76d77395123735232c43c0ed1f934d1e004a6194d0fa SHA512 9566cebf8fc29ead1f919309e3f98aeb618e97b34c80f53d1f739f1a3f4ef4cbaebd1c67f0b32172a0cdf14dc405eb75d0e916dedf3b8a758cdec2368d25f5c1 -DIST sbcl-1.4.11-armhf-linux-binary.tar.bz2 9767589 BLAKE2B 2949338bc19973e0ca38f435caaa4c991a6c86d70dc092a4f1b6ec3eefa47af76f2a0c3fd8a4f8004127f4b8b3666a5cf4260b6ab56802308880067e4eaf8568 SHA512 297edddc36e9b9de080f9e25faa323e23877af234104b4b7e0fe2b74f0dd117d9cf0caa87b79718a8b071bcb5e97c8118f1d11af0e4aba2a961beb40c4dc99cb DIST sbcl-1.4.2-arm64-linux-binary.tar.bz2 10578821 BLAKE2B 1cd25c548be0f1b7ec01edc3bee7fe6c2aaf07b7bd1fc55d408dee7ac95e8f3761a194bf9e8efb734179a7eff04cdae2fe5ba4a9ba5ab06f7322ac1550d142cc SHA512 39bbd735b242aa0bbac05c6f4dbe28cb45e01684db7e5b4f1e51f995a9f9d5b484f63cc4243f472f72b3b1e6c4cd2268a7e812b15426eca5cf9a1fede10f44bb DIST sbcl-1.4.3-x86-linux-binary.tar.bz2 10227185 BLAKE2B 6d77c4f4177cbdb72fb9bab0da5bd91e0aa8deafffd238818a2551332f0ab246715d9489b5c1156f3481aa7fb79d161a988404620fc09fe86ff927543a1ee678 SHA512 41cd63d61dd7c46370341dce39a362287a23b528bfebe8e5571614aeefdea03d318207d25562e995db9ccedb6c1f50ea4d66627721f0fd9486e99440126e6a38 DIST sbcl-1.5.8-ppc64le-linux-binary.tar.bz2 10025597 BLAKE2B aac079e3585ebe9d5b610cf096e958edfd4410361b0d96b2fa88a285cbdce4133d89e1ddf0cf6729d43d6c3057365d07a3d73362f906fd8798b76c993210a8e5 SHA512 443ab604caa768c756f3322d7c599142a50227914bcd6be12434432daf1e3d5af0740d1ebdb166b856cc77ddf02451e29fcef9e29099f7bc4fb49ad61db17674 -DIST sbcl-2.2.9-source.tar.bz2 7258148 BLAKE2B ed7c220644120c467bcf2ef0a254b5065a6169d1560238dabbb4589831b2f094801b018d3b0bfc5e671328204ae34be763ec9df32ab7c5dcffd4860400582ae8 SHA512 6e215c7d34fe0db681b558206061f40bc1e235a0c2eb39518811bf2803e6a91f220b36e25da408a6756fd84071b6d634dc41e4acba73fdb0ffbab2cd77c9a8db -DIST sbcl-2.2.9-x86-64-linux-binary.tar.bz2 11641067 BLAKE2B 4afeb6c3dee6d0b13790b005882d0702978f039feb3dd85fc483282b04b40ee797f8506f2db1611abf148589215583640f02022a11d4e01e854bd4a566fdd48e SHA512 53f9da74dd18056cf086e2f2258949eb53cdaabe9b3f24b004378e65c7a3ae5821a8501868415d662fc24d59bd0edb2c3b67419ebe48d459e8546e17fb692400 DIST sbcl-2.3.3-armhf-linux-binary.tar.bz2 9932803 BLAKE2B 77e0da4a60fd74caaef3adbf29446a50323c18433cc36418d9e670e410882137cdd482ef4b2da989190c27d1cc737dba0848ad652044832337e39243088813f3 SHA512 b9810c2fe9f34ee974cb90b3b79dbb4c77053300fd029eae216fbb2772da539f2b71ca13c868772adf618f364fc73994a3a467e0a535fe5195b7eb6b0fee3571 DIST sbcl-2.3.4-x86-64-linux-binary.tar.bz2 11783208 BLAKE2B 40e77c69a3df76749941138720e85cb8b4df4a334b19e4bf998caace63bb016efd321a51b9b3a86cf34a5ad10c7967a2b131d83b63f506f6e196ac5436d874e1 SHA512 2b7ab43f8fb10b4dd2effdd7209b4028a4a48fcc52564406acb9470ab5c6079217369da2a4f170f1ceb56ccc8cc11d129c1cb4daba85e20aa1a3345daa9e19b9 DIST sbcl-2.3.5-source.tar.bz2 7474392 BLAKE2B 0b4f678dccbb18c18d59709aa2ce9facec3ada9f32cf1d398e1686f63615ab82781da68d6b5914294adab88e18501945d57b6d630507e02a8d89351379f769f3 SHA512 89635b6ebd18a481c56bb40b69ef58f13b2e2ebdb6b1244a1eea3b0d9e85dc1659391754b7c8ba533455575e91989889fe41be05314297f8e49bf11170001004 DIST sbcl-2.3.6-source.tar.bz2 7483612 BLAKE2B 92428617b925a1fdd2dc0a5d8af61c2b4353bdc6305a9331fc0c945e9cec4b6119f8db0c7c611d3db82c3868a7635134496c7ba335de393abe9c055ef1ced6e3 SHA512 f71ac11b3f70c77e5b87fced73333a466dfb387bc19170330419d71aea310bc09b9918ea106eb655cb8118b203191716a7b27406bb3557640395189c36e09282 DIST sbcl-2.3.6-x86-64-linux-binary.tar.bz2 11904608 BLAKE2B 240fee1c929b79c311f5708bb72060fc159cbe7f341cec7f98cdb2428e80d0c37f83b9d4fc7822329b794db77553d2c4293a19b3077964b728480cc2f9e9ea8d SHA512 166c348b83f20a8e66f89a22580a000afa1e0b0b14d19332823a8b4e87f9090032cf4a57ae36089eb7ed6c83777335b3823a631e716337e0833d3e84219ea1f4 -EBUILD sbcl-2.2.9.ebuild 8435 BLAKE2B 21e1a79791f05c1f22c41bb3c8536ea73a8d7e337eb42c6a4d8feacac726418d58cd42d5cf144f8041dec47b6180d144b34a461e996a577d72f4e6078350dc94 SHA512 2300982e8623290026775c009e422f92779b6a0c338f6f290bf6518f9c046e6908e35fa1e8b3e4b2c87866ee787dcd6fd63155eeea1d5cb7dce6562d869f7eee +DIST sbcl-2.3.7-source.tar.bz2 7495739 BLAKE2B e0116b2f8a01cce77d177e840da23f6b2b5672ace913200e134bb5900ad299bc9dcff110ea15f47186940724722ab97add20d22a114942cbebe624c9e4d845d4 SHA512 0ff7951342d997eb6a7305d3268e27e94c9b6689c6c3fd9b115cc34378f3aa23e07d97ff4e2cfb4090a7621f313a2bbbaf50d663f8e14162f7ee315077c958cb +DIST sbcl-2.3.7-x86-64-linux-binary.tar.bz2 11807371 BLAKE2B bfea9daa9b20aad6ab4261af4b6c05fd5fb13d1416df390d240eae8554478eb599d6beefa989ac2904108241ca1971bc33a00bdd615d88833e4a5abec6725718 SHA512 da94e7136026cfedfbb2def7ba727372bc6e7aea47de9366a706cb522031f5c08fe149fd1727db18511f89b1022c1e3790ef3e83bcbfe4a76e4336c476b80079 EBUILD sbcl-2.3.5.ebuild 9047 BLAKE2B 4d131f13136d90b8a8f09b2328ffe762eea33b28fde2e0195f78e5633c1d6de82c18e70857379eff298ee4a01da5f3e047938ceec234dccd10bd154372ca1b18 SHA512 eec1e639ea47dd37e681db5c897a317148bda2ef34be88fa49d17b931fc16731a204a52a5fab5ae6f4f2b55b78f44bea9885c9e475489e7d0bceb21a4506247d EBUILD sbcl-2.3.6.ebuild 9051 BLAKE2B 69c2fe75a14df83bff342dd2d1eeb51bd27b36be3643ac868778985b470d8d98f1d03f0e9ca71759353a4acde51c5d9f5400b037d3ad1ce333bb58980b2cfe38 SHA512 6bbd21e70f49f9fc20b3829495a85028b7d067acb9b86c06c55830a191240f3814ad70a88619c8b00b32797395e85c40e43b422702f7f797b07e6569246bfecf -MISC metadata.xml 1521 BLAKE2B 27bbbc61f17123ff93e75d52b7247152860af2c4a11b97ee2a12910da83011dd27865845f574161756e3573c7dc962b64b8c086a5b48237c32edb042ec277f10 SHA512 68aed1024100ffdb04f1ef2179032eb68223ecc80c79a3b16b9325544942730c04d67b9d43a8ab2df5fe0e95d3ec8d1bdd163672390388260f39bbf69e9c9bcf +EBUILD sbcl-2.3.7.ebuild 9141 BLAKE2B 24d8ed38740c1abc21f1df4072a96eb8af2e2b0d3458f7a352eaaf0c982b700583c6159f90b393fd40be146a841983b0082dbdf65b633a0fef31cc8158eec3e1 SHA512 98bffd6bd815220edfacfbacf3788fb62bdb67f20ca565372155a53b3225a076e258ec1167e15b7965b7690a62bcb7f4abcd1603add3a8552a0ee82e882b0e13 +MISC metadata.xml 1429 BLAKE2B 59750e8f97481ee938def9de21017bb06b89b3ec72914f7d0e30f8b13cccf7124d23a6293d7b3ae3aff00d4e0564a3d20af6a98f9034aa31f24e42e6515ee055 SHA512 5ec54831af483785fd1f613295691380f1827af6cc63fa42e886839efe4dde0ad55f4b7ae655ec57d81500bf9fd6cef2edb62f92d738d55f8103836bbd260303 diff --git a/dev-lisp/sbcl/files/build-id-2.3.6.patch b/dev-lisp/sbcl/files/build-id-2.3.6.patch new file mode 100644 index 000000000000..45d579788123 --- /dev/null +++ b/dev-lisp/sbcl/files/build-id-2.3.6.patch @@ -0,0 +1,12 @@ +diff -r -U3 sbcl-2.3.6.orig/make-config.sh sbcl-2.3.6/make-config.sh +--- sbcl-2.3.6.orig/make-config.sh 2023-06-28 13:35:17.000000000 +0700 ++++ sbcl-2.3.6/make-config.sh 2023-08-06 15:49:33.994027736 +0700 +@@ -801,7 +801,7 @@ + # use /usr/xpg4/bin/id instead of /usr/bin/id + PATH=/usr/xpg4/bin:$PATH + fi +-echo '"'`hostname`-`id -un`-`date +%Y-%m-%d-%H-%M-%S`'"' > output/build-id.inc ++echo "\"${PV}\"" > output/build-id.inc + + if [ -n "$SBCL_HOST_LOCATION" ]; then + echo //setting up host configuration diff --git a/dev-lisp/sbcl/metadata.xml b/dev-lisp/sbcl/metadata.xml index a9185d3a05a7..46f8e1bbbccc 100644 --- a/dev-lisp/sbcl/metadata.xml +++ b/dev-lisp/sbcl/metadata.xml @@ -24,7 +24,6 @@ GLIBC. SBCL 0.8.17 and later support Unicode. </longdescription> <use> - <flag name="capstone">Enable disassembly support with <pkg>dev-libs/capstone</pkg></flag> <flag name="system-bootstrap">Bootstrap SBCL using either system SBCL installation or <pkg>dev-lisp/clisp</pkg></flag> </use> <upstream> diff --git a/dev-lisp/sbcl/sbcl-2.2.9.ebuild b/dev-lisp/sbcl/sbcl-2.3.7.ebuild index 50b9982e2bff..f54abb98d8e8 100644 --- a/dev-lisp/sbcl/sbcl-2.2.9.ebuild +++ b/dev-lisp/sbcl/sbcl-2.3.7.ebuild @@ -7,12 +7,12 @@ inherit flag-o-matic pax-utils toolchain-funcs #same order as http://www.sbcl.org/platform-table.html BV_X86=1.4.3 -BV_AMD64=2.2.9 +BV_AMD64=2.3.7 BV_PPC=1.2.7 BV_PPC64LE=1.5.8 BV_SPARC=1.0.28 BV_ALPHA=1.0.28 -BV_ARM=1.4.11 +BV_ARM=2.3.3 BV_ARM64=1.4.2 BV_X64_MACOS=1.2.11 BV_PPC_MACOS=1.0.47 @@ -22,31 +22,35 @@ BV_SPARC_SOLARIS=1.0.23 DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" HOMEPAGE="https://www.sbcl.org/ http://sbcl.sourceforge.net/" -BSD_SOCKETS_TEST_PATCH=bsd-sockets-test-2.0.5.patch +BSD_SOCKETS_TEST_PATCH=bsd-sockets-test-2.3.6.patch SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 https://dev.gentoo.org/~grozin/${BSD_SOCKETS_TEST_PATCH}.gz - x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) - amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) - ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) - ppc64? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC64LE}-ppc64le-linux-binary.tar.bz2 ) - sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) - arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )" + !system-bootstrap? ( + x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) + amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) + ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) + ppc64? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC64LE}-ppc64le-linux-binary.tar.bz2 ) + sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) + alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) + arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) + arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) + x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) + ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) + x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 ) + )" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="-* amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="capstone debug doc source +threads +unicode +zstd" +KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="system-bootstrap debug doc source +threads +unicode +zstd" -CDEPEND=">=dev-lisp/asdf-3.3:= - capstone? ( dev-libs/capstone:0/4 )" +CDEPEND=">=dev-lisp/asdf-3.3:= \ + prefix? ( dev-util/patchelf )" # bug #843851 BDEPEND="${CDEPEND} - doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )" + dev-util/strace + doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) + system-bootstrap? ( || ( dev-lisp/clisp dev-lisp/sbcl ) )" RDEPEND="${CDEPEND} zstd? ( app-arch/zstd ) !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" @@ -92,7 +96,9 @@ sbcl_apply_features() { src_unpack() { unpack ${A} - mv sbcl-*-* sbcl-binary || die + if ! use system-bootstrap ; then + mv sbcl-*-* sbcl-binary || die + fi cd "${S}" } @@ -105,6 +111,8 @@ src_prepare() { eapply "${FILESDIR}"/sb-posix-test-2.2.9.patch # bug #767742 eapply "${FILESDIR}"/etags-2.1.0.patch + # Use ${PV} as build-id, bug #797574 + eapply "${FILESDIR}"/build-id-2.3.6.patch eapply "${FILESDIR}"/verbose-build-2.0.3.patch @@ -144,8 +152,6 @@ src_prepare() { # change location of /etc/sbclrc ... sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die - use capstone || rm -rf contrib/sb-capstone - find . -type f -name .cvsignore -delete } @@ -154,12 +160,28 @@ src_configure() { # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr + # set interpreter for Prefix + if use prefix ; then + patchelf --set-interpreter \ + "${EPREFIX}/$(get_libdir)"/ld-linux-x86-64.so.2 \ + "${WORKDIR}"/sbcl-binary/src/runtime/sbcl + fi + # applying customizations sbcl_apply_features } src_compile() { local bindir="${WORKDIR}"/sbcl-binary + local bootstrap_lisp="sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" + + if use system-bootstrap ; then + if has_version "dev-lisp/sbcl" ; then + bootstrap_lisp="sbcl --no-sysinit --no-userinit --disable-debugger" + else + bootstrap_lisp="clisp" + fi + fi # Bug #869434 append-cppflags -D_GNU_SOURCE @@ -169,8 +191,9 @@ src_compile() { env - HOME="${T}" PATH="${PATH}" \ CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ - GNUMAKE=make ./make.sh \ - "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ + SBCL_HOME="/usr/$(get_libdir)/sbcl" SBCL_SOURCE_ROOT="/usr/$(get_libdir)/sbcl/src" \ + GNUMAKE=make PV=${PV} ./make.sh \ + "${bootstrap_lisp}" \ || die "make failed" # need to set HOME because libpango(used by graphviz) complains about it |