diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-12-28 06:30:54 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-12-28 06:30:54 +0000 |
commit | 72fd2b48b7154274a1d2009cdaab54e7f49fb3aa (patch) | |
tree | 9c6ce981e8f924eb5f24e71e13c91b37aafb8616 /dev-db | |
parent | 721e451ec418e1712f6962404e111f0ebd487389 (diff) |
gentoo auto-resync : 28:12:2024 - 06:30:54
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/Manifest.gz | bin | 16616 -> 16610 bytes | |||
-rw-r--r-- | dev-db/mariadb/Manifest | 4 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.11.10.ebuild | 4 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-11.4.4.ebuild | 4 | ||||
-rw-r--r-- | dev-db/sqlite/Manifest | 9 | ||||
-rw-r--r-- | dev-db/sqlite/files/sqlite-3.47.0-allocator-mismatch.patch | 37 | ||||
-rw-r--r-- | dev-db/sqlite/files/sqlite-3.47.0-buildtclext.patch | 122 | ||||
-rw-r--r-- | dev-db/sqlite/files/sqlite-3.47.0-nonbash.patch | 53 | ||||
-rw-r--r-- | dev-db/sqlite/sqlite-3.47.0-r1.ebuild | 429 | ||||
-rw-r--r-- | dev-db/sqlite/sqlite-3.47.1.ebuild | 427 |
10 files changed, 8 insertions, 1081 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz Binary files differindex ed080dbccccd..cd78edc10644 100644 --- a/dev-db/Manifest.gz +++ b/dev-db/Manifest.gz diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index 094739c3ed6d..9faf7aa2ab6d 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -18,11 +18,11 @@ DIST mariadb-10.6.20-patches-01.tar.xz 5304 BLAKE2B dd038f4f60e9410965111fd912b5 DIST mariadb-10.6.20.tar.gz 102697156 BLAKE2B 8bd665406c3462890a783276f4946c92d8824f9b134ffc912908b8404c83aad2342f86391ff1a827420e0dc7221adfa0203eb76fceb1cd3dffc53acc421242cc SHA512 de5465551fa837b6834b8435a5f04f894c2c2d5d0fdb7a05373728e166755a384f19cebd4e87910240929d3657d361b3943616246b4fcf0d97cf706e317ece96 DIST mariadb-11.4.4-patches-01.tar.xz 5300 BLAKE2B dbebe4e5068c8ce56dc11527e37aea16727723d7ac9351865e8761e95209900ca50782ab2ce44fd86ad2e70f59b6ffa9c0758f158c48870e343ce37bca37b9fb SHA512 af51163404c699e7580ffd1fa931f86dafa7e6471641ba40f7072a04b6f1f4df0e89cc89926be6062810d18c55b97e3c696367ae483fbabab0227e69d7866f99 DIST mariadb-11.4.4.tar.gz 111017581 BLAKE2B 0680c7d0a93b60dc02bd5cba49fcc050245606edc6a14aead7995b5f4baa15d731b857d5f1ca4bec2febd1b0a0062c5162ff9a8231397a40c9a740db4e5264d0 SHA512 dfa4c137d67c11c997bf67bceb27d072c51831f35e2ad438fe2f234cb530eb74e3283429aef620036db06943d7309dec36a4d015f578fd2a1f933637681841fb -EBUILD mariadb-10.11.10.ebuild 42840 BLAKE2B ac89ddc8926281cff97bda8d399d20279d3dcb4d43b61999271b81337c75a6cfa90b8dce8cc4f655b91c34b90128d3c44bfaf4291d39c93348ad1ab6a26fddce SHA512 f1bbbe374cd228e5ef9805389155a951931bc7a2df8fafa218b1d437d70a207cc1c243f9d71554b52d7c37ee3d63291003330248bc973a29750facdf22b16755 +EBUILD mariadb-10.11.10.ebuild 42926 BLAKE2B 8bffaeced0845094bed0f0958d98454912c06c2e6aedc73109c61b7ef83ccb478e79ef7ef2a6b95880135a3e71cbda816fc047b48960befa0a0edcf2a9b04277 SHA512 c029e2bbdf5578ad46d863c7d00c4f3c8de1af985a792cfe3a61a03fb9687aec3c7d2cffa1476a58cf92b3f01e664106ab6e333df7afa712a675d4aa8ee96bfb EBUILD mariadb-10.11.5-r1.ebuild 42624 BLAKE2B 4986355393faf58cf56afb08ba21628ec9655617586d165df1667c4ffbe8792f76dff1a319b03de2cdc8f857a312d7e3200a17c3d9e1008d32d568cc71b00bc5 SHA512 54b914d59947932ee487514300a968b363201312991e41a812caf53dae29f085712dd1bb158ce24dadef3117705bbd9b326567d473fac2332bf7521a914b67d3 EBUILD mariadb-10.6.14.ebuild 43027 BLAKE2B b2d5adf3ed54f435d6f09ab651d89b54db446b41f3e1bfcb220f005559baf93d4d4dee85c6d94a1df46bdfe11550713c5da6f1e179a77d13a29cdbd2503c1545 SHA512 392a6063672ab098671413cd76a6011d6110ec8f51c9d8a2e669cbf38dc574672c6ab317d32634aaa4daeee75010ec09c97c8b05e02f77c438b08a886c032db7 EBUILD mariadb-10.6.15.ebuild 42828 BLAKE2B 3d02a9a306819fee4d70481d97f8d2ae246864477a54a71199e69419f26e09ed20c7c3d7805940784c5d5e277d49c7b27b38211c001167b496324f6aec37681c SHA512 7ff2877e1254c86190595ac6283f1a2b37f63eb37c579fe53b1eb05e51a7ea1f8dae9444e31964bb7b0caee03524d74f5bb3d03aebe6ea4ea222bd82f781ec64 EBUILD mariadb-10.6.17.ebuild 42885 BLAKE2B 2e4f123ba402d38f537f46cee3536dea219081e56ef9e19ab3b2671d65af7f3356028867ed923fe7c26d15427f1b2be4669ef04d71c998d70d49cf88e4998d25 SHA512 5b2edb5694818b5112f5a7e993aa3c812872d4964b33c8c6b2a045be0e87b2e8c5ef8ebc42332e4b994bebf4e1396432953b06507b85b11d4d27b35b6cbcdb02 EBUILD mariadb-10.6.20.ebuild 42751 BLAKE2B d74213a0be2cf1b2be7a159b410be4badd73c312e1de891135c844412b568fdc4f8e6c64019d2dd5cd008e65025203fd5ecaae71ef356230ecfa8a949ba183d7 SHA512 4ae6e25fa7e28391a11ac71f3c8795808a532e4c51d62b3c19c477340e36ca5cf456ccac29a58093b676c2aa1ec1803e7855ff2c17d9897d2ab256eedabda729 -EBUILD mariadb-11.4.4.ebuild 42842 BLAKE2B 9885d3dade2744a7e112b9d7fac9311cd29c0d5095f3d873b90bc5cfb7012b2a5d7a36931d34259023a31e940ac0cd00092940ec7acc85faa494cab1fd0c5a80 SHA512 4452d4aa1bf9031d7148e32018bce9e3a509456a405a784b08c1bb100f7b58a8ca903d107d53063bed50319d6bf2bbd31c97a8818eb1065219def58ba218fd41 +EBUILD mariadb-11.4.4.ebuild 42928 BLAKE2B e201fadfeaad71c0798a533c505f2caf63fb7a066d862bcf2747c0b132f4705af6d7fa76283099e470d21afa6404dff7522a42555e74cc6689f86a4bfac9a145 SHA512 9f22b43a551f7f30c00702e9bc59b4d1bd0bf25c5a33e5ef2eee155521fd72a844873bd07ae6407b44dce8fb1c99f68196c7e8e7cb99693654ea90cbaceeae39 MISC metadata.xml 2415 BLAKE2B 15e491cb0881203b21f66652af9e420582e3992a610bde08dfae2d076c417b298529eafd659adaa4cdeecd70b0c10c83796f8dfd8fbdede7489c48fdd2bdb015 SHA512 ecc641157ada5ad6d84b534b6a40e27e59ef428668d61f3908817735d31d4828dd0327343bf4ad13a5f6a1bc306cc46137388489176c3116f2a0e0946471b49b diff --git a/dev-db/mariadb/mariadb-10.11.10.ebuild b/dev-db/mariadb/mariadb-10.11.10.ebuild index 91122de09f6a..e414f8b901bc 100644 --- a/dev-db/mariadb/mariadb-10.11.10.ebuild +++ b/dev-db/mariadb/mariadb-10.11.10.ebuild @@ -40,11 +40,13 @@ REQUIRED_USE="jdbc? ( extraengine server !static ) # # libfmt-10 contains a bug which was fixed in libfmt-11, see # https://jira.mariadb.org/browse/MDEV-32815, bug 946074 +# libfmt-11.1 works with # FMT_STATIC_THOUSANDS_SEPARATOR +# differently, bug 946924 COMMON_DEPEND=" dev-libs/libfmt:= || ( <dev-libs/libfmt-10 - >=dev-libs/libfmt-11 + =dev-libs/libfmt-11.0* ) >=dev-libs/libpcre2-10.34:= >=sys-apps/texinfo-4.7-r1 diff --git a/dev-db/mariadb/mariadb-11.4.4.ebuild b/dev-db/mariadb/mariadb-11.4.4.ebuild index 6f83048a4765..70b4bbbc8a0a 100644 --- a/dev-db/mariadb/mariadb-11.4.4.ebuild +++ b/dev-db/mariadb/mariadb-11.4.4.ebuild @@ -40,11 +40,13 @@ REQUIRED_USE="jdbc? ( extraengine server !static ) # # libfmt-10 contains a bug which was fixed in libfmt-11, see # https://jira.mariadb.org/browse/MDEV-32815, bug 946074 +# libfmt-11.1 works with # FMT_STATIC_THOUSANDS_SEPARATOR +# differently, bug 946924 COMMON_DEPEND=" dev-libs/libfmt:= || ( <dev-libs/libfmt-10 - >=dev-libs/libfmt-11 + =dev-libs/libfmt-11.0* ) >=dev-libs/libpcre2-10.34:= >=sys-apps/texinfo-4.7-r1 diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest index 28a460170a54..f4bd1e8b6743 100644 --- a/dev-db/sqlite/Manifest +++ b/dev-db/sqlite/Manifest @@ -1,19 +1,10 @@ AUX sqlite-3.45.1-ppc64-ptr.patch 986 BLAKE2B 8c97514a67601c1f51459c1d4ea683e023730b3fa66be7a238807f172ce19ebceeed8f81c9f6e4f3621c96eecd8f6ea3bd5669a8a5ee5b14cf2bebdb7338e0db SHA512 12c6384682a36cddfdde7d2cfdba8aad54441b816816abf139bb05c46f65e78548c5a9e4f7f8b8836bd95702455b93ed7e0afb868ab15fead20a84404f075615 -AUX sqlite-3.47.0-allocator-mismatch.patch 1574 BLAKE2B c9e2a590b418ad009b6434b17e9e67a8ca63e8eb785c93753786bb581d0d0e584a6d73fe35850bb9bd6ed390e5d29e1568ecbe294db99b69978f0b5d38d72878 SHA512 99313357c2f003f15e68332e81e9a78428591255e25e57bf6b597135fd0c532e58dd7d1f0d92e9b3fc51c03a8cde18557e18fcacba1df7fffcd0beeb28cb0150 -AUX sqlite-3.47.0-buildtclext.patch 4177 BLAKE2B 653cdd04aa78ce0d66e0fd30e5c0e811617875439804b7967ca550232ce80165f148c289899164600e6b02781e403bf4b29525f2f763ffa241ef13d43a48fd3f SHA512 80f01db442578d301a50f9ae989e3bbb02bcf1b2d8bd9c99a537a90871f06612f135ebee2e44df320fd7c08ab714335a291667a9c566e46e47de88718b8c45af -AUX sqlite-3.47.0-nonbash.patch 2086 BLAKE2B d791fe6bcfb115f814608f40500a3a321b7dd519aa5396a5e55fa96bde492356174c4c440e7cde28a477057d5f56453b246a991fd7818de908ed7c671573eec0 SHA512 c5c530cd936b5656d69d87a10704465cfb0b4029850780b613fd2e34b2c046476503e8ca7aef841f9757887757498f8544e3bf1005f3c7a1b9a8056c98ab79e8 AUX sqlite-3.47.1-buildtclext.patch 986 BLAKE2B ba43fd663a77a2a161a26f31ca3db0f4b08fae940a08b4bdfa7882a7945eef1b041f11d70cbe6754fe1bc58c533f2b5864e25a90c6d38e8f1c4f27f8cfc3bd91 SHA512 20ff9155832fc23984f91c3c7fc6ab775ab026fb4a3b7d97f00b67583702c81d714db1345a28050c1be39376d411b2faa137b25719d4d312ac42cf00c73ade47 DIST sqlite-doc-3460100.zip 10851427 BLAKE2B 7462e83ca84e3e9aac7236f575fd2bdddac7744ae700a63fe8fdc9d2df3157c59fd374d99a0526bd4d9f742005ee7a90f3d78057861d3c3fcba9f897630e48db SHA512 1ad7dfc938d182f69ea9367b4f5ead1d48b991626521249e8b58c9fb4c2553e348ce402de9cc81b0ad699d4c45c467de56a98ee39f9c3555c6fafff15fba41ce -DIST sqlite-doc-3470000.zip 10937359 BLAKE2B 3fc349e4b2b0cd3fc59147519062133261463e09933419f330cd18e6b120d3498c10a1864c85c2de144430f1dbf7f9a867aba47ab77dbe2aa0b5128e0742dddf SHA512 20c126551a95905e63e99930e3f7964b6e3fc8b72fbbedf5484f669817af2a8384f05fce89d6117a5e232ba71f5469894d4bb22ba7abd796b24fd624372c7c17 -DIST sqlite-doc-3470100.zip 10945765 BLAKE2B 10181e3c5d35f76edf40b6fbda1d5505eb0a6996ff7ca2eebb39140c7e167493377ff66e746b42d543d8040d6f87b4a7960711ad8e12ff419b1a36cb2d15542d SHA512 7d02f4aa5e1c49670b15cdbc013bbdd713b3dac574f2d8a71d0eed2ecf5785c7dc64039079bcff6f872d3a9cf798977468b4147e5a166c9fa49b9d5c6ef2e9d8 DIST sqlite-doc-3470200.zip 10957830 BLAKE2B cbc40dd440d1c5af4ad4333090a7306bd54ec43250a478b6900b8f74bd721035018ea7647f3a208d42cc0639827325be26a9412d17af7d390f4e584d4c6acf44 SHA512 48349d512b7cd9bc6f6a5da3a2b2285de159d4653667311adb0f5e6a970060db940a590c2d01b529afc1614065b22434d5b3ac4d8d0122d003d74926745ba56e DIST sqlite-src-3460100.zip 14276926 BLAKE2B df16ea944e317df8ed64fdfab289e3699ec71725ce55e2b30450adaeb41c061b4fba1eb8c41ba638b0edcd12b23264a1f9e413b69fd593c2b65fb1037d3fc8b2 SHA512 6d32a0db9f95d3cec34f02f3fd45b453bf7c422d4d4d9570790f641e7d190b8b31be8e8715afacc1b6e4417f15a4d15a0b28e608ae0b4b5f3054b075783b916e -DIST sqlite-src-3470000.zip 14408459 BLAKE2B c8e883410fdf9f020bc55ef01d7c2c5b7f1744d3475e7755f2395b24b2d5397302aac2eb7912161cbc2a705a1d7a94b1fa5e8f4e5dbf374c31de56228cbc9e5d SHA512 294d718fb1ebb23e2a4d6e8b7f498d7a7d922e6af5e36452fae075c0d48f4d4f64b5f235ab561b1e47fb7722efc647dfe541164cc385ddc0e2ec0dbce1f40b01 -DIST sqlite-src-3470100.zip 14415832 BLAKE2B 0f238a263c00da5e388fd56080a2a9e7fd64177f0bc59868b52dac96ab4615841500f6dc0b294ae54dd7415217b3a8720db28a354be622a7dcc0c162dbe1c161 SHA512 a7f82a91e1f694d446c9c12398e082074c2c5374a00f1b7e382f077a956bc1e0171abfdb84172605b31e4e61cf1b7ed22adbf7196d41637916c508d12aa1196a DIST sqlite-src-3470200.zip 14421983 BLAKE2B dcaea5be0099b2dad1b53403933f0037ace48b1f248040c1b5cc116ac2ad6c9b44c71b8efe3afd16bef01119b440d1a2ec9d553a22f855e0ba55793684f53d8d SHA512 a6280a02304bfae173d9e9ebf376b2d3624658f04af4d8e95d5a042e24cf0405a47c0a4023f4dbc2790716cd85e16b97fcc0a83c1534e6d554f4eb0bfb0a3ed3 EBUILD sqlite-3.46.1.ebuild 12792 BLAKE2B ca98f4e22e0ba7abdf3c1c8a785e82a6f64d19f186a68d9733fbe31db879c2d3d0b1b517b3ea3f0af5c678cd9c036a8702c4f3e87f3a20c5b4342e391fd720d9 SHA512 6633db1ba661ed8948e21ffb245f59f7507669224d3b827c16d4fc5332d9b2bd62f176066afc7f59ed5104b0a5d15dc4eb8ed91ba4ab55b2afb773d6026708a0 -EBUILD sqlite-3.47.0-r1.ebuild 12913 BLAKE2B efef3474627c29bbafa616f192569e6091bac26d2abd4a29beaf6749c6ee4e2b6646567c465c800e08de37ba815ae5a8b096fa4bf25b159e77b6869528224070 SHA512 c6ffa3c6de1aad5592a2442908d7632fe8c53f759de539cd393eb5116bf029b170339fa0d464fa549e94f16ff9a08bdbcc3c24d2737fd32da9cc6cc1f709d0b0 -EBUILD sqlite-3.47.1.ebuild 12818 BLAKE2B a6c4b7404ef3eae9fc7fd8122f510f7faa1d3e44c5ac4b39fb35ad047223da5671f23633ef65343d87964e2542515c1b48a063158875494f1b8263242ee438e5 SHA512 510f19d0a90e04edadb7f254077bf8b9220106b75646faf16be1f943172b969d44b23eb3c81303914e68e11c12529a72ed51046b025c6b2ad5f6b21e30599bf4 EBUILD sqlite-3.47.2.ebuild 12818 BLAKE2B a6c4b7404ef3eae9fc7fd8122f510f7faa1d3e44c5ac4b39fb35ad047223da5671f23633ef65343d87964e2542515c1b48a063158875494f1b8263242ee438e5 SHA512 510f19d0a90e04edadb7f254077bf8b9220106b75646faf16be1f943172b969d44b23eb3c81303914e68e11c12529a72ed51046b025c6b2ad5f6b21e30599bf4 EBUILD sqlite-9999.ebuild 12715 BLAKE2B d79519648d078c7c19312f1df796e2e681c40f2992649fa21b146a5fd16d469656fe02c2a52292a1dff66b38d9ac8061cbc468b162a4051cef56b4d4f1a462cd SHA512 fc50a53d730f618f33c600bf7886e94176404908975da1e5f893916f36c86bf0c4135ee1469026d703483339994638076f0fdc884aa7bad802be2cfaf713dc92 MISC metadata.xml 824 BLAKE2B 8ab2e8f230bf3a2b26077d90944bca7bf35ae905310205b90bf243365148488303256606c0ee7c3fb736300686466a1c2583bf103693c20063ca668fe9e52647 SHA512 ed4a89e3c2d633cb6ebf8bcbf3ca055d0d1b2ffd801ba559395f812faeaafdfedd97dae11a5a53a4c068e43026fbd4eed4cb12c8b89a7fda6dabe6f78a2e0b38 diff --git a/dev-db/sqlite/files/sqlite-3.47.0-allocator-mismatch.patch b/dev-db/sqlite/files/sqlite-3.47.0-allocator-mismatch.patch deleted file mode 100644 index 35ea63a28e6a..000000000000 --- a/dev-db/sqlite/files/sqlite-3.47.0-allocator-mismatch.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://github.com/sqlite/sqlite/commit/76b77c63f730aa163d82d082c0e1bf648cc4c567 - -From 76b77c63f730aa163d82d082c0e1bf648cc4c567 Mon Sep 17 00:00:00 2001 -From: stephan <stephan@noemail.net> -Date: Mon, 4 Nov 2024 13:59:58 +0000 -Subject: [PATCH] Fix two mismatched uses of malloc() and sqlite3_free() in - sqlite3_stdio.c, as reported in [forum:7dd7c70038 | forum post 7dd7c70038]. - -FossilOrigin-Name: 5238959d05bbf3c12f488a55e52f3e9733138993d0365255184dffeb2bf36c03 ---- - ext/misc/sqlite3_stdio.c | 4 ++-- - manifest | 13 +++++++------ - manifest.uuid | 2 +- - 3 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/ext/misc/sqlite3_stdio.c b/ext/misc/sqlite3_stdio.c -index 5bb26084c2..ba37e4be30 100644 ---- a/ext/misc/sqlite3_stdio.c -+++ b/ext/misc/sqlite3_stdio.c -@@ -146,7 +146,7 @@ char *sqlite3_fgets(char *buf, int sz, FILE *in){ - ** that into UTF-8. Otherwise, non-ASCII characters all get translated - ** into '?'. - */ -- wchar_t *b1 = malloc( sz*sizeof(wchar_t) ); -+ wchar_t *b1 = sqlite3_malloc( sz*sizeof(wchar_t) ); - if( b1==0 ) return 0; - _setmode(_fileno(in), IsConsole(in) ? _O_WTEXT : _O_U8TEXT); - if( fgetws(b1, sz/4, in)==0 ){ -@@ -212,7 +212,7 @@ int sqlite3_fputs(const char *z, FILE *out){ - ** use O_U8TEXT for everything in text mode. - */ - int sz = (int)strlen(z); -- wchar_t *b1 = malloc( (sz+1)*sizeof(wchar_t) ); -+ wchar_t *b1 = sqlite3_malloc( (sz+1)*sizeof(wchar_t) ); - if( b1==0 ) return 0; - sz = MultiByteToWideChar(CP_UTF8, 0, z, sz, b1, sz); - b1[sz] = 0; diff --git a/dev-db/sqlite/files/sqlite-3.47.0-buildtclext.patch b/dev-db/sqlite/files/sqlite-3.47.0-buildtclext.patch deleted file mode 100644 index 491674f5e993..000000000000 --- a/dev-db/sqlite/files/sqlite-3.47.0-buildtclext.patch +++ /dev/null @@ -1,122 +0,0 @@ -# https://sqlite.org/forum/forumpost/0683a49cb02f31a1 -# https://bugs.gentoo.org/942918 -# Compiled from https://sqlite.org/forum/forumpost/6fd4ca69e86eafc6, https://www.sqlite.org/src/info/38136b33f9536b63 and https://www.sqlite.org/src/info/2f6e5946cf34e094 - ---- a/tool/buildtclext.tcl -+++ b/tool/buildtclext.tcl -@@ -140,12 +140,13 @@ - if {[string length $OPTS]>1} { - append LDFLAGS $OPTS - } -- set CMD [subst $cmd] - if {$TCLMAJOR>8} { - set OUT libtcl9sqlite$VERSION.$SUFFIX - } else { - set OUT libsqlite$VERSION.$SUFFIX - } -+ set @ $OUT; # workaround for https://sqlite.org/forum/forumpost/6b1af7eb10884373 -+ set CMD [subst $cmd] - } - - # Show information about prior installs - -From b03592c324a4d066e12c3af945dd510dc28b6d65 Mon Sep 17 00:00:00 2001 -From: stephan <stephan@noemail.net> -Date: Sat, 16 Nov 2024 14:33:01 +0000 -Subject: [PATCH] Add DESTDIR support to the tclextension-install target, via - [67a3ca0c013b] and [d1663cf05f7d]. - ---- a/Makefile.in -+++ b/Makefile.in -@@ -1600,7 +1600,7 @@ tclextension: tclsqlite3.c - # to find it. - # - tclextension-install: tclsqlite3.c -- $(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --cc "$(CC)" $(CFLAGS) $(OPT_FEATURE_FLAGS) $(OPTS) -+ $(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --destdir "$(DESTDIR)" --cc "$(CC)" $(CFLAGS) $(OPT_FEATURE_FLAGS) $(OPTS) - - # Install the SQLite TCL extension that is used by $TCLSH_CMD - # -+38136b33f9536b63520d3810f397a3b4b5372028b31108806f84fe44bf338425 ---- a/tool/buildtclext.tcl -+++ b/tool/buildtclext.tcl -@@ -15,6 +15,7 @@ Options: - --info Show info on existing SQLite TCL extension installs - --install-only Install an extension previously build - --uninstall Uninstall the extension -+ --destdir DIR Installation root (used by "make install DESTDIR=...") - - Other options are retained and passed through into the compiler.} - -@@ -25,6 +26,7 @@ set uninstall 0 - set infoonly 0 - set CC {} - set OPTS {} -+set DESTDIR ""; # --destdir "$(DESTDIR)" - for {set ii 0} {$ii<[llength $argv]} {incr ii} { - set a0 [lindex $argv $ii] - if {$a0=="--install-only"} { -@@ -42,6 +44,9 @@ for {set ii 0} {$ii<[llength $argv]} {incr ii} { - } elseif {$a0=="--cc" && $ii+1<[llength $argv]} { - incr ii - set CC [lindex $argv $ii] -+ } elseif {$a0=="--destdir" && $ii+1<[llength $argv]} { -+ incr ii -+ set DESTDIR [lindex $argv $ii] - } elseif {[string match -* $a0]} { - append OPTS " $a0" - } else { -@@ -245,7 +250,7 @@ package ifneeded sqlite3 $VERSION \\ - - if {$install} { - # Install the extension -- set DEST2 $DEST/sqlite$VERSION -+ set DEST2 ${DESTDIR}$DEST/sqlite$VERSION - file mkdir $DEST2 - puts "installing $DEST2/pkgIndex.tcl" - file copy -force pkgIndex.tcl $DEST2 - -From 375552f224813c7e2fac0e67dd13ecd6ba3a3571 Mon Sep 17 00:00:00 2001 -From: stephan <stephan@noemail.net> -Date: Sat, 16 Nov 2024 17:12:17 +0000 -Subject: [PATCH] Handle DESTDIR at an earlier phase in buildtclext.tcl to - account for the is-writable-dir check and to filter out //zipfs: dirs as - (im)possible installation targets. ---- a/tool/buildtclext.tcl -+++ b/tool/buildtclext.tcl -@@ -198,7 +198,15 @@ if {$install} { - # - set DEST {} - foreach dir $auto_path { -- if {[file writable $dir]} { -+ if {[string match //*:* $dir]} { -+ # We can't install to //zipfs: paths -+ continue -+ } elseif {"" ne $DESTDIR && ![file writable $DESTDIR]} { -+ continue -+ } -+ set dir ${DESTDIR}$dir -+ if {[file writable $dir] || "" ne $DESTDIR} { -+ # the dir will be created later ^^^^^^^^ - set DEST $dir - break - } elseif {[glob -nocomplain $dir/sqlite3*/pkgIndex.tcl]!=""} { -@@ -216,7 +224,7 @@ if {$install} { - puts "to work around this problem.\n" - puts "These are the (unwritable) \$auto_path directories:\n" - foreach dir $auto_path { -- puts " * $dir" -+ puts " * ${DESTDIR}$dir" - } - exit 1 - } -@@ -250,7 +258,7 @@ package ifneeded sqlite3 $VERSION \\ - - if {$install} { - # Install the extension -- set DEST2 ${DESTDIR}$DEST/sqlite$VERSION -+ set DEST2 $DEST/sqlite$VERSION - file mkdir $DEST2 - puts "installing $DEST2/pkgIndex.tcl" - file copy -force pkgIndex.tcl $DEST2 - diff --git a/dev-db/sqlite/files/sqlite-3.47.0-nonbash.patch b/dev-db/sqlite/files/sqlite-3.47.0-nonbash.patch deleted file mode 100644 index 3eece5ed5b29..000000000000 --- a/dev-db/sqlite/files/sqlite-3.47.0-nonbash.patch +++ /dev/null @@ -1,53 +0,0 @@ -https://sqlite.org/forum/info/14274389fb2 -https://bugs.gentoo.org/942917 -https://bugs.gentoo.org/942918 -https://github.com/sqlite/sqlite/commit/a40e6e927313ed97a895ff7c022eff705e50b1e6 - -From a40e6e927313ed97a895ff7c022eff705e50b1e6 Mon Sep 17 00:00:00 2001 -From: stephan <stephan@noemail.net> -Date: Wed, 30 Oct 2024 00:35:08 +0000 -Subject: [PATCH] Replace 3 instances of the == 'test' shell command operator - with =, as == is apparently not as portable across shells. Problem reported - in [forum:14274389fb2|forum post 14274389fb2]. - -FossilOrigin-Name: 68199c40fedeb07a3f9c5024fac6376a0579a13b0e5690aef6238e3e22b9c1b7 ---- a/configure -+++ b/configure -@@ -10334,7 +10334,7 @@ else - fi - - original_use_tcl=${use_tcl} --if test x"${with_tclsh}" == x -a x"${with_tcl}" == x; then -+if test x"${with_tclsh}" = x -a x"${with_tcl}" = x; then - for ac_prog in tclsh9.0 tclsh8.6 tclsh - do - # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -10453,7 +10453,7 @@ $as_echo "unable to run tests because no tclConfig.sh file could be located" >&6 - HAVE_TCL=0 - fi - --if test x"$TCLSH_CMD" == x; then -+if test x"$TCLSH_CMD" = x; then - TCLSH_CMD=${TCL_EXEC_PREFIX}/bin/tclsh${TCL_VERSION} - if test ! -x ${TCLSH_CMD}; then - TCLSH_CMD_2=${TCL_EXEC_PREFIX}/bin/tclsh ---- a/configure.ac -+++ b/configure.ac -@@ -124,7 +124,7 @@ AC_ARG_WITH(tcl, AS_HELP_STRING([--with-tcl=DIR],[directory containing (tclConfi - AC_ARG_ENABLE(tcl, AS_HELP_STRING([--disable-tcl],[omit building accessory programs that require TCL-dev]), - [use_tcl=$enableval],[use_tcl=yes]) - original_use_tcl=${use_tcl} --if test x"${with_tclsh}" == x -a x"${with_tcl}" == x; then -+if test x"${with_tclsh}" = x -a x"${with_tcl}" = x; then - AC_CHECK_PROGS(TCLSH_CMD, [tclsh9.0 tclsh8.6 tclsh],none) - with_tclsh=${TCLSH_CMD} - fi -@@ -195,7 +195,7 @@ else - HAVE_TCL=0 - fi - AC_SUBST(HAVE_TCL) --if test x"$TCLSH_CMD" == x; then -+if test x"$TCLSH_CMD" = x; then - TCLSH_CMD=${TCL_EXEC_PREFIX}/bin/tclsh${TCL_VERSION} - if test ! -x ${TCLSH_CMD}; then - TCLSH_CMD_2=${TCL_EXEC_PREFIX}/bin/tclsh diff --git a/dev-db/sqlite/sqlite-3.47.0-r1.ebuild b/dev-db/sqlite/sqlite-3.47.0-r1.ebuild deleted file mode 100644 index b3dd1b416b61..000000000000 --- a/dev-db/sqlite/sqlite-3.47.0-r1.ebuild +++ /dev/null @@ -1,429 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic multilib-minimal toolchain-funcs - -DESCRIPTION="SQL database engine" -HOMEPAGE="https://sqlite.org/" - -# On version updates, make sure to read the forum (https://sqlite.org/forum/forum) -# for hints regarding test failures, backports, etc. -if [[ ${PV} == 9999 ]]; then - S="${WORKDIR}"/${PN} - PROPERTIES="live" -else - printf -v SRC_PV "%u%02u%02u%02u" $(ver_rs 1- " ") - DOC_PV="${SRC_PV}" - #printf -v DOC_PV "%u%02u%02u00" $(ver_rs 1-3 " ") - - SRC_URI=" - https://sqlite.org/2024/${PN}-src-${SRC_PV}.zip - doc? ( https://sqlite.org/2024/${PN}-doc-${DOC_PV}.zip ) - " - S="${WORKDIR}/${PN}-src-${SRC_PV}" - - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="public-domain" -SLOT="3" -IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" -RESTRICT="!test? ( test )" - -RDEPEND=" - sys-libs/zlib:=[${MULTILIB_USEDEP}] - icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) - readline? ( sys-libs/readline:=[${MULTILIB_USEDEP}] ) - tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] ) - tools? ( dev-lang/tcl:= ) -" -DEPEND=" - ${RDEPEND} - test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] ) -" -BDEPEND=">=dev-lang/tcl-8.6:0" -if [[ ${PV} == 9999 ]]; then - BDEPEND+=" dev-vcs/fossil" -else - BDEPEND+=" app-arch/unzip" -fi - -PATCHES=( - "${FILESDIR}"/${PN}-3.45.1-ppc64-ptr.patch - "${FILESDIR}"/${PN}-3.47.0-nonbash.patch - "${FILESDIR}"/${PN}-3.47.0-allocator-mismatch.patch - "${FILESDIR}"/${PN}-3.47.0-buildtclext.patch -) - -_fossil_fetch() { - local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}" - local repo_id="${1}" - local repo_uri="${2}" - - local -x FOSSIL_HOME="${HOME}" - - mkdir -p "${T}/fossil/${repo_id}" || die - pushd "${T}/fossil/${repo_id}" > /dev/null || die - - if [[ -n "${EVCS_OFFLINE}" ]]; then - if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then - die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\"" - fi - else - if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then - einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" - fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die - echo - else - cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die - einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" - fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die - echo - fi - - ( - addwrite "${distdir}" - mkdir -p "${distdir}/fossil-src/${repo_id}" || die - cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die - ) - fi - - popd > /dev/null || die -} - -_fossil_checkout() { - local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}" - local repo_id="${1}" - local branch_or_commit="${2}" - local target_directory="${3}" - - local -x FOSSIL_HOME="${HOME}" - - if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then - die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\"" - fi - - if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then - mkdir -p "${T}/fossil/${repo_id}" || die - cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die - fi - - mkdir "${target_directory}" || die - pushd "${target_directory}" > /dev/null || die - - einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" - fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die - echo - - popd > /dev/null || die -} - -fossil_fetch() { - local repo_id="${1}" - local repo_uri="${2}" - local target_directory="${3}" - - local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}" - - _fossil_fetch "${repo_id}" "${repo_uri}" - _fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}" -} - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}" - if use doc; then - fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc" - fi - else - default - fi -} - -src_prepare() { - default - - eautoreconf - multilib_copy_sources -} - -multilib_src_configure() { - local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" - local options=() - - options+=( - --enable-load-extension - --enable-threadsafe - ) - - # Support detection of misuse of SQLite API. - # https://sqlite.org/compile.html#enable_api_armor - append-cppflags -DSQLITE_ENABLE_API_ARMOR - - # Support bytecode and tables_used virtual tables. - # https://sqlite.org/compile.html#enable_bytecode_vtab - # https://sqlite.org/bytecodevtab.html - append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB - - # Support column metadata functions. - # https://sqlite.org/compile.html#enable_column_metadata - # https://sqlite.org/c3ref/column_database_name.html - append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA - - # Support sqlite_dbpage virtual table. - # https://sqlite.org/compile.html#enable_dbpage_vtab - # https://sqlite.org/dbpage.html - append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB - - # Support dbstat virtual table. - # https://sqlite.org/compile.html#enable_dbstat_vtab - # https://sqlite.org/dbstat.html - append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB - - # Support sqlite3_serialize() and sqlite3_deserialize() functions. - # https://sqlite.org/compile.html#enable_deserialize - # https://sqlite.org/c3ref/serialize.html - # https://sqlite.org/c3ref/deserialize.html - append-cppflags -DSQLITE_ENABLE_DESERIALIZE - - # Support comments in output of EXPLAIN. - # https://sqlite.org/compile.html#enable_explain_comments - append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS - - # Support Full-Text Search versions 3, 4 and 5. - # https://sqlite.org/compile.html#enable_fts3 - # https://sqlite.org/compile.html#enable_fts3_parenthesis - # https://sqlite.org/compile.html#enable_fts4 - # https://sqlite.org/compile.html#enable_fts5 - # https://sqlite.org/fts3.html - # https://sqlite.org/fts5.html - append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 - options+=( --enable-fts5 ) - - # Support hidden columns. - append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS - - # Support memsys5 memory allocator. - # https://sqlite.org/compile.html#enable_memsys5 - # https://sqlite.org/malloc.html#memsys5 - append-cppflags -DSQLITE_ENABLE_MEMSYS5 - - # Support sqlite3_normalized_sql() function. - # https://sqlite.org/c3ref/expanded_sql.html - append-cppflags -DSQLITE_ENABLE_NORMALIZE - - # Support sqlite_offset() function. - # https://sqlite.org/compile.html#enable_offset_sql_func - # https://sqlite.org/lang_corefunc.html#sqlite_offset - append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC - - # Support pre-update hook functions. - # https://sqlite.org/compile.html#enable_preupdate_hook - # https://sqlite.org/c3ref/preupdate_count.html - append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK - - # Support Resumable Bulk Update extension. - # https://sqlite.org/compile.html#enable_rbu - # https://sqlite.org/rbu.html - append-cppflags -DSQLITE_ENABLE_RBU - - # Support R*Trees. - # https://sqlite.org/compile.html#enable_rtree - # https://sqlite.org/compile.html#enable_geopoly - # https://sqlite.org/rtree.html - # https://sqlite.org/geopoly.html - append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY - - # Support Session extension. - # https://sqlite.org/compile.html#enable_session - # https://sqlite.org/sessionintro.html - append-cppflags -DSQLITE_ENABLE_SESSION - - # Support scan status functions. - # https://sqlite.org/compile.html#enable_stmt_scanstatus - # https://sqlite.org/c3ref/stmt_scanstatus.html - # https://sqlite.org/c3ref/stmt_scanstatus_reset.html - append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS - - # Support sqlite_stmt virtual table. - # https://sqlite.org/compile.html#enable_stmtvtab - # https://sqlite.org/stmt.html - append-cppflags -DSQLITE_ENABLE_STMTVTAB - - # Support unknown() function. - # https://sqlite.org/compile.html#enable_unknown_sql_function - append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION - - # Support unlock notification. - # https://sqlite.org/compile.html#enable_unlock_notify - # https://sqlite.org/c3ref/unlock_notify.html - # https://sqlite.org/unlock_notify.html - append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY - - # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements. - # https://sqlite.org/compile.html#enable_update_delete_limit - # https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses - # https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses - append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT - - # Support soundex() function. - # https://sqlite.org/compile.html#soundex - # https://sqlite.org/lang_corefunc.html#soundex - append-cppflags -DSQLITE_SOUNDEX - - # Support URI filenames. - # https://sqlite.org/compile.html#use_uri - # https://sqlite.org/uri.html - append-cppflags -DSQLITE_USE_URI - - options+=( $(use_enable debug) ) - - if use icu; then - # Support ICU extension. - # https://sqlite.org/compile.html#enable_icu - append-cppflags -DSQLITE_ENABLE_ICU - sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" - fi - - options+=( - --disable-editline - $(use_enable readline) - ) - - if use readline; then - options+=( --with-readline-inc="-I${ESYSROOT}/usr/include/readline" ) - fi - - if use secure-delete; then - # Enable secure_delete pragma by default. - # https://sqlite.org/compile.html#secure_delete - # https://sqlite.org/pragma.html#pragma_secure_delete - append-cppflags -DSQLITE_SECURE_DELETE - fi - - options+=( $(use_enable static-libs static) ) - - # tcl, test, tools USE flags. - if use tcl || use test || { use tools && multilib_is_native_abi; }; then - options+=( - --enable-tcl - --with-tcl="${ESYSROOT}/usr/$(get_libdir)" - ) - else - options+=( --disable-tcl ) - fi - - if [[ "${ABI}" == "x86" ]]; then - if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then - append-cflags -mfpmath=sse - else - append-cflags -ffloat-store - fi - fi - - econf "${options[@]}" -} - -multilib_src_compile() { - emake HAVE_TCL="$(usev tcl 1)" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" - - if use tools && multilib_is_native_abi; then - emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh - fi - - if [[ ${PV} == 9999 ]] && use doc && multilib_is_native_abi; then - emake tclsqlite3.c - - local build_directory="$(pwd)" - build_directory="${build_directory##*/}" - - mkdir "${WORKDIR}/${PN}-doc-build" || die - pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die - - emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc - rmdir doc/matrix{/*,} || die - - popd > /dev/null || die - fi -} - -multilib_src_test() { - if [[ "${EUID}" -eq 0 ]]; then - ewarn "Skipping tests due to root permissions" - return - fi - - local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}" - - # e_uri.test tries to open files in /. - # bug #839798 - local SANDBOX_PREDICT=${SANDBOX_PREDICT} - addpredict "/test.db" - addpredict "/ÿ.db" - - emake -Onone $(usex debug 'fulltest' 'test') -} - -multilib_src_install() { - emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install - - if use tools && multilib_is_native_abi; then - install_tool() { - if [[ -f ".libs/${1}" ]]; then - newbin ".libs/${1}" "${2}" - else - newbin "${1}" "${2}" - fi - } - - install_tool changeset sqlite3-changeset - install_tool dbdump sqlite3-db-dump - install_tool dbhash sqlite3-db-hash - install_tool dbtotxt sqlite3-db-to-txt - install_tool index_usage sqlite3-index-usage - install_tool rbu sqlite3-rbu - install_tool scrub sqlite3-scrub - install_tool showdb sqlite3-show-db - install_tool showjournal sqlite3-show-journal - install_tool showshm sqlite3-show-shm - install_tool showstat4 sqlite3-show-stat4 - install_tool showwal sqlite3-show-wal - install_tool sqldiff sqlite3-diff - install_tool sqlite3_analyzer sqlite3-analyzer - install_tool sqlite3_checker sqlite3-checker - install_tool sqlite3_expert sqlite3-expert - install_tool sqltclsh sqlite3-tclsh - - unset -f install_tool - fi -} - -multilib_src_install_all() { - find "${ED}" -name "*.la" -delete || die - - doman sqlite3.1 - - if use doc; then - if [[ ${PV} == 9999 ]]; then - pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die - else - pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die - fi - - find "(" -name "*.db" -o -name "*.txt" ")" -delete || die - if [[ ${PV} != 9999 ]]; then - rm search search.d/admin || die - rmdir search.d || die - find -name "*~" -delete || die - fi - - ( - docinto html - dodoc -r * - ) - - popd > /dev/null || die - fi -} diff --git a/dev-db/sqlite/sqlite-3.47.1.ebuild b/dev-db/sqlite/sqlite-3.47.1.ebuild deleted file mode 100644 index a5d7c70c508f..000000000000 --- a/dev-db/sqlite/sqlite-3.47.1.ebuild +++ /dev/null @@ -1,427 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic multilib-minimal toolchain-funcs - -DESCRIPTION="SQL database engine" -HOMEPAGE="https://sqlite.org/" - -# On version updates, make sure to read the forum (https://sqlite.org/forum/forum) -# for hints regarding test failures, backports, etc. -if [[ ${PV} == 9999 ]]; then - S="${WORKDIR}"/${PN} - PROPERTIES="live" -else - printf -v SRC_PV "%u%02u%02u%02u" $(ver_rs 1- " ") - DOC_PV="${SRC_PV}" - #printf -v DOC_PV "%u%02u%02u00" $(ver_rs 1-3 " ") - - SRC_URI=" - https://sqlite.org/2024/${PN}-src-${SRC_PV}.zip - doc? ( https://sqlite.org/2024/${PN}-doc-${DOC_PV}.zip ) - " - S="${WORKDIR}/${PN}-src-${SRC_PV}" - - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="public-domain" -SLOT="3" -IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" -RESTRICT="!test? ( test )" - -RDEPEND=" - sys-libs/zlib:=[${MULTILIB_USEDEP}] - icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) - readline? ( sys-libs/readline:=[${MULTILIB_USEDEP}] ) - tcl? ( dev-lang/tcl:=[${MULTILIB_USEDEP}] ) - tools? ( dev-lang/tcl:= ) -" -DEPEND=" - ${RDEPEND} - test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] ) -" -BDEPEND=">=dev-lang/tcl-8.6:0" -if [[ ${PV} == 9999 ]]; then - BDEPEND+=" dev-vcs/fossil" -else - BDEPEND+=" app-arch/unzip" -fi - -PATCHES=( - "${FILESDIR}"/${PN}-3.45.1-ppc64-ptr.patch - "${FILESDIR}"/${PN}-3.47.1-buildtclext.patch -) - -_fossil_fetch() { - local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}" - local repo_id="${1}" - local repo_uri="${2}" - - local -x FOSSIL_HOME="${HOME}" - - mkdir -p "${T}/fossil/${repo_id}" || die - pushd "${T}/fossil/${repo_id}" > /dev/null || die - - if [[ -n "${EVCS_OFFLINE}" ]]; then - if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then - die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\"" - fi - else - if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then - einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" - fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die - echo - else - cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die - einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" - fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die - echo - fi - - ( - addwrite "${distdir}" - mkdir -p "${distdir}/fossil-src/${repo_id}" || die - cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die - ) - fi - - popd > /dev/null || die -} - -_fossil_checkout() { - local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}" - local repo_id="${1}" - local branch_or_commit="${2}" - local target_directory="${3}" - - local -x FOSSIL_HOME="${HOME}" - - if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then - die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\"" - fi - - if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then - mkdir -p "${T}/fossil/${repo_id}" || die - cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die - fi - - mkdir "${target_directory}" || die - pushd "${target_directory}" > /dev/null || die - - einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" - fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die - echo - - popd > /dev/null || die -} - -fossil_fetch() { - local repo_id="${1}" - local repo_uri="${2}" - local target_directory="${3}" - - local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}" - - _fossil_fetch "${repo_id}" "${repo_uri}" - _fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}" -} - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}" - if use doc; then - fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc" - fi - else - default - fi -} - -src_prepare() { - default - - eautoreconf - multilib_copy_sources -} - -multilib_src_configure() { - local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" - local options=() - - options+=( - --enable-load-extension - --enable-threadsafe - ) - - # Support detection of misuse of SQLite API. - # https://sqlite.org/compile.html#enable_api_armor - append-cppflags -DSQLITE_ENABLE_API_ARMOR - - # Support bytecode and tables_used virtual tables. - # https://sqlite.org/compile.html#enable_bytecode_vtab - # https://sqlite.org/bytecodevtab.html - append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB - - # Support column metadata functions. - # https://sqlite.org/compile.html#enable_column_metadata - # https://sqlite.org/c3ref/column_database_name.html - append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA - - # Support sqlite_dbpage virtual table. - # https://sqlite.org/compile.html#enable_dbpage_vtab - # https://sqlite.org/dbpage.html - append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB - - # Support dbstat virtual table. - # https://sqlite.org/compile.html#enable_dbstat_vtab - # https://sqlite.org/dbstat.html - append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB - - # Support sqlite3_serialize() and sqlite3_deserialize() functions. - # https://sqlite.org/compile.html#enable_deserialize - # https://sqlite.org/c3ref/serialize.html - # https://sqlite.org/c3ref/deserialize.html - append-cppflags -DSQLITE_ENABLE_DESERIALIZE - - # Support comments in output of EXPLAIN. - # https://sqlite.org/compile.html#enable_explain_comments - append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS - - # Support Full-Text Search versions 3, 4 and 5. - # https://sqlite.org/compile.html#enable_fts3 - # https://sqlite.org/compile.html#enable_fts3_parenthesis - # https://sqlite.org/compile.html#enable_fts4 - # https://sqlite.org/compile.html#enable_fts5 - # https://sqlite.org/fts3.html - # https://sqlite.org/fts5.html - append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 - options+=( --enable-fts5 ) - - # Support hidden columns. - append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS - - # Support memsys5 memory allocator. - # https://sqlite.org/compile.html#enable_memsys5 - # https://sqlite.org/malloc.html#memsys5 - append-cppflags -DSQLITE_ENABLE_MEMSYS5 - - # Support sqlite3_normalized_sql() function. - # https://sqlite.org/c3ref/expanded_sql.html - append-cppflags -DSQLITE_ENABLE_NORMALIZE - - # Support sqlite_offset() function. - # https://sqlite.org/compile.html#enable_offset_sql_func - # https://sqlite.org/lang_corefunc.html#sqlite_offset - append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC - - # Support pre-update hook functions. - # https://sqlite.org/compile.html#enable_preupdate_hook - # https://sqlite.org/c3ref/preupdate_count.html - append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK - - # Support Resumable Bulk Update extension. - # https://sqlite.org/compile.html#enable_rbu - # https://sqlite.org/rbu.html - append-cppflags -DSQLITE_ENABLE_RBU - - # Support R*Trees. - # https://sqlite.org/compile.html#enable_rtree - # https://sqlite.org/compile.html#enable_geopoly - # https://sqlite.org/rtree.html - # https://sqlite.org/geopoly.html - append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY - - # Support Session extension. - # https://sqlite.org/compile.html#enable_session - # https://sqlite.org/sessionintro.html - append-cppflags -DSQLITE_ENABLE_SESSION - - # Support scan status functions. - # https://sqlite.org/compile.html#enable_stmt_scanstatus - # https://sqlite.org/c3ref/stmt_scanstatus.html - # https://sqlite.org/c3ref/stmt_scanstatus_reset.html - append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS - - # Support sqlite_stmt virtual table. - # https://sqlite.org/compile.html#enable_stmtvtab - # https://sqlite.org/stmt.html - append-cppflags -DSQLITE_ENABLE_STMTVTAB - - # Support unknown() function. - # https://sqlite.org/compile.html#enable_unknown_sql_function - append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION - - # Support unlock notification. - # https://sqlite.org/compile.html#enable_unlock_notify - # https://sqlite.org/c3ref/unlock_notify.html - # https://sqlite.org/unlock_notify.html - append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY - - # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements. - # https://sqlite.org/compile.html#enable_update_delete_limit - # https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses - # https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses - append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT - - # Support soundex() function. - # https://sqlite.org/compile.html#soundex - # https://sqlite.org/lang_corefunc.html#soundex - append-cppflags -DSQLITE_SOUNDEX - - # Support URI filenames. - # https://sqlite.org/compile.html#use_uri - # https://sqlite.org/uri.html - append-cppflags -DSQLITE_USE_URI - - options+=( $(use_enable debug) ) - - if use icu; then - # Support ICU extension. - # https://sqlite.org/compile.html#enable_icu - append-cppflags -DSQLITE_ENABLE_ICU - sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" - fi - - options+=( - --disable-editline - $(use_enable readline) - ) - - if use readline; then - options+=( --with-readline-inc="-I${ESYSROOT}/usr/include/readline" ) - fi - - if use secure-delete; then - # Enable secure_delete pragma by default. - # https://sqlite.org/compile.html#secure_delete - # https://sqlite.org/pragma.html#pragma_secure_delete - append-cppflags -DSQLITE_SECURE_DELETE - fi - - options+=( $(use_enable static-libs static) ) - - # tcl, test, tools USE flags. - if use tcl || use test || { use tools && multilib_is_native_abi; }; then - options+=( - --enable-tcl - --with-tcl="${ESYSROOT}/usr/$(get_libdir)" - ) - else - options+=( --disable-tcl ) - fi - - if [[ "${ABI}" == "x86" ]]; then - if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then - append-cflags -mfpmath=sse - else - append-cflags -ffloat-store - fi - fi - - econf "${options[@]}" -} - -multilib_src_compile() { - emake HAVE_TCL="$(usev tcl 1)" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" - - if use tools && multilib_is_native_abi; then - emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh - fi - - if [[ ${PV} == 9999 ]] && use doc && multilib_is_native_abi; then - emake tclsqlite3.c - - local build_directory="$(pwd)" - build_directory="${build_directory##*/}" - - mkdir "${WORKDIR}/${PN}-doc-build" || die - pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die - - emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc - rmdir doc/matrix{/*,} || die - - popd > /dev/null || die - fi -} - -multilib_src_test() { - if [[ "${EUID}" -eq 0 ]]; then - ewarn "Skipping tests due to root permissions" - return - fi - - local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}" - - # e_uri.test tries to open files in /. - # bug #839798 - local SANDBOX_PREDICT=${SANDBOX_PREDICT} - addpredict "/test.db" - addpredict "/ÿ.db" - - emake -Onone $(usex debug 'fulltest' 'test') -} - -multilib_src_install() { - emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install - - if use tools && multilib_is_native_abi; then - install_tool() { - if [[ -f ".libs/${1}" ]]; then - newbin ".libs/${1}" "${2}" - else - newbin "${1}" "${2}" - fi - } - - install_tool changeset sqlite3-changeset - install_tool dbdump sqlite3-db-dump - install_tool dbhash sqlite3-db-hash - install_tool dbtotxt sqlite3-db-to-txt - install_tool index_usage sqlite3-index-usage - install_tool rbu sqlite3-rbu - install_tool scrub sqlite3-scrub - install_tool showdb sqlite3-show-db - install_tool showjournal sqlite3-show-journal - install_tool showshm sqlite3-show-shm - install_tool showstat4 sqlite3-show-stat4 - install_tool showwal sqlite3-show-wal - install_tool sqldiff sqlite3-diff - install_tool sqlite3_analyzer sqlite3-analyzer - install_tool sqlite3_checker sqlite3-checker - install_tool sqlite3_expert sqlite3-expert - install_tool sqltclsh sqlite3-tclsh - - unset -f install_tool - fi -} - -multilib_src_install_all() { - find "${ED}" -name "*.la" -delete || die - - doman sqlite3.1 - - if use doc; then - if [[ ${PV} == 9999 ]]; then - pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die - else - pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die - fi - - find "(" -name "*.db" -o -name "*.txt" ")" -delete || die - if [[ ${PV} != 9999 ]]; then - rm search search.d/admin || die - rmdir search.d || die - find -name "*~" -delete || die - fi - - ( - docinto html - dodoc -r * - ) - - popd > /dev/null || die - fi -} |