commit: f797e0fd4092a1d9e83c23005806a2db3d7bd0c2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> AuthorDate: Thu Jul 2 13:54:37 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Jul 4 13:52:28 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f797e0fd
dev-db/sqlite: Drop support for non-Tcl build. Closes: https://bugs.gentoo.org/724578 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> dev-db/sqlite/Manifest | 1 - dev-db/sqlite/sqlite-3.32.3.ebuild | 94 ++++++++------------------------------ 2 files changed, 20 insertions(+), 75 deletions(-) diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest index 1e33d9d9906..f1c2a7767c1 100644 --- a/dev-db/sqlite/Manifest +++ b/dev-db/sqlite/Manifest @@ -1,5 +1,4 @@ DIST sqlite-autoconf-3310100.tar.gz 2887243 BLAKE2B ef5d40b6e6c59a51ae95368eb9f6a938188813f89d5328ea1c1180ef35f124c14b3e83b0832ae5c2fa24cc2df352f1b0ea5f20b64d0762d50a700d9895f9a12e SHA512 d85250ba5f78f0c918880f663741709aba662192f04888b2324a0df17affdf5b8540e8428c6c7315119806e7adad758ea281c9b403c0ad94ac6a9bd1b93fd617 -DIST sqlite-autoconf-3320300.tar.gz 2904404 BLAKE2B 23c75256f31bd24ca14949afd144ac3280dcaaf25301ffcb8b9ecea6834fce9b1aee603ef616c2987674ae30afb59326c6f2010870b075f7d4c6566a2329f155 SHA512 add0ef47c059be0a75add7ab4fe52b2fbd4060cacbf1cbb93f1b4007cdeb8fc92256b1aadc224c4839e733fb868e56d9d73dd33c56a6f66180d1ff001d8d275e DIST sqlite-doc-3310100.zip 9600405 BLAKE2B 324fb7a0a38bc56476e41504c14996e9d5d83ac659403991515413d49f5ee3aad064ccece25f52b6041ef26bf23f320a9be1b6b02c5fbe96c36372107f54fc2e SHA512 5572e2c2dac30c014ef9cd60a620b7a7bb610f91a47e2890c0641540d39b9d5ce0e914ee697583130317633918b7827e2612a7cbc024f5bd6aa22ad28a78b56b DIST sqlite-doc-3320300.zip 9772933 BLAKE2B efd72c18d0398c103e3f9c4cfeb03e7794fd69691b1bcea95b74a0c5d8af22aa13abc84ce8dc5864b5f4cb79be239433933b4daca34d1adfcc6f31ce2cde66bf SHA512 af9dca970b4c03c058d7d1cd55a3d11fa4b112dccac942b8660d82a7e9ba2956963fcb429eedfdc85915637c102e1f904ace98c8e0455c4120422bbd9f2f3cd0 DIST sqlite-src-3310100.zip 12510166 BLAKE2B a856695e8552b8b4dcb28452fdbd48305fdb9072f9d6587f4b1f4445daf386e920eb936dcb50fdfe41a49f84b26a7c5fedcffea5acf3ba3fa935c36695d4b8ee SHA512 af92a00877bcd90372d6f83a27fea12b4fe8d1155b223a6bccbccc31bb8e3d2269cd9e68f329bc55f70d1068ccbf220ff5abccea6f593fd7a3a4bdd732d1cdbe diff --git a/dev-db/sqlite/sqlite-3.32.3.ebuild b/dev-db/sqlite/sqlite-3.32.3.ebuild index 42d31da076a..837ec066c9e 100644 --- a/dev-db/sqlite/sqlite-3.32.3.ebuild +++ b/dev-db/sqlite/sqlite-3.32.3.ebuild @@ -16,11 +16,8 @@ HOMEPAGE="https://sqlite.org/"; if [[ "${PV}" == "9999" ]]; then SRC_URI="" else - SRC_URI="doc? ( https://sqlite.org/2020/${PN}-doc-${DOC_PV}.zip ) - tcl? ( https://sqlite.org/2020/${PN}-src-${SRC_PV}.zip ) - test? ( https://sqlite.org/2020/${PN}-src-${SRC_PV}.zip ) - tools? ( https://sqlite.org/2020/${PN}-src-${SRC_PV}.zip ) - !tcl? ( !test? ( !tools? ( https://sqlite.org/2020/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" + SRC_URI="https://sqlite.org/2020/${PN}-src-${SRC_PV}.zip + doc? ( https://sqlite.org/2020/${PN}-doc-${DOC_PV}.zip )" fi LICENSE="public-domain" @@ -36,19 +33,8 @@ if [[ "${PV}" == "9999" ]]; then BDEPEND=">=dev-lang/tcl-8.6:0 dev-vcs/fossil" else - BDEPEND="doc? ( app-arch/unzip ) - tcl? ( - app-arch/unzip - >=dev-lang/tcl-8.6:0 - ) - test? ( - app-arch/unzip - >=dev-lang/tcl-8.6:0 - ) - tools? ( - app-arch/unzip - >=dev-lang/tcl-8.6:0 - )" + BDEPEND="app-arch/unzip + >=dev-lang/tcl-8.6:0" fi RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) @@ -58,21 +44,11 @@ RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] DEPEND="${RDEPEND} test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" -full_archive() { - [[ "${PV}" == "9999" ]] || use tcl || use test || use tools -} - -pkg_setup() { - if [[ "${PV}" == "9999" ]]; then - S="${WORKDIR}/${PN}" - else - if full_archive; then - S="${WORKDIR}/${PN}-src-${SRC_PV}" - else - S="${WORKDIR}/${PN}-autoconf-${SRC_PV}" - fi - fi -} +if [[ "${PV}" == "9999" ]]; then + S="${WORKDIR}/${PN}" +else + S="${WORKDIR}/${PN}-src-${SRC_PV}" +fi src_unpack() { if [[ "${PV}" == "9999" ]]; then @@ -123,27 +99,14 @@ src_unpack() { } src_prepare() { - if full_archive; then - eapply "${FILESDIR}/${PN}-3.32.1-full_archive-build_1.patch" - eapply "${FILESDIR}/${PN}-3.32.1-full_archive-build_2.patch" + eapply "${FILESDIR}/${PN}-3.32.1-full_archive-build_1.patch" + eapply "${FILESDIR}/${PN}-3.32.1-full_archive-build_2.patch" - eapply_user + eapply_user - # Fix AC_CHECK_FUNCS. - # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html - sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed" - else - eapply "${FILESDIR}/${PN}-3.25.0-nonfull_archive-build.patch" - - eapply_user - - # Fix AC_CHECK_FUNCS. - # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html - sed \ - -e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \ - -e "/AC_CHECK_FUNCS(posix_fallocate)/d" \ - -i configure.ac || die "sed failed" - fi + # Fix AC_CHECK_FUNCS. + # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html + sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed" eautoreconf @@ -155,12 +118,9 @@ multilib_src_configure() { local options=() options+=( - --enable-$(full_archive && echo load-extension || echo dynamic-extensions) + --enable-load-extension --enable-threadsafe ) - if ! full_archive; then - options+=(--disable-static-shell) - fi # Support detection of misuse of SQLite API. # https://sqlite.org/compile.html#enable_api_armor @@ -264,26 +224,14 @@ multilib_src_configure() { append-cppflags -DSQLITE_USE_URI # debug USE flag. - if full_archive; then - options+=($(use_enable debug)) - else - if use debug; then - append-cppflags -DSQLITE_DEBUG - else - append-cppflags -DNDEBUG - fi - fi + options+=($(use_enable debug)) # icu USE flag. if use icu; then # Support ICU extension. # https://sqlite.org/compile.html#enable_icu append-cppflags -DSQLITE_ENABLE_ICU - if full_archive; then - sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" - else - sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" - fi + sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" fi # readline USE flag. @@ -291,7 +239,7 @@ multilib_src_configure() { --disable-editline $(use_enable readline) ) - if full_archive && use readline; then + if use readline; then options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline") fi @@ -306,9 +254,7 @@ multilib_src_configure() { options+=($(use_enable static-libs static)) # tcl, test, tools USE flags. - if full_archive; then - options+=(--enable-tcl) - fi + options+=(--enable-tcl) if [[ "${CHOST}" == *-mint* ]]; then append-cppflags -DSQLITE_OMIT_WAL
