Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump(main/libsqlite): 3.45.3; chore(main/libsqlite-tcl): subpackage of libsqlite #20059

Merged
merged 1 commit into from
May 9, 2024

Conversation

twaik
Copy link
Member

@twaik twaik commented May 8, 2024

Closes #20058
I will merge this in 24 hours if no activity.

@twaik twaik requested review from finagolfin and Grimler91 as code owners May 8, 2024 18:41
@twaik twaik requested a review from TomJo2000 May 8, 2024 18:41
Copy link
Member

@TomJo2000 TomJo2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why you called me in for a review, doesn't look like I've ever touched the package, but this looks all fine to me, so I'll just leave some observations.

packages/libsqlite/build.sh Show resolved Hide resolved
packages/libsqlite/build.sh Show resolved Hide resolved
@Biswa96
Copy link
Member

Biswa96 commented May 8, 2024

Is it required to configure/make the project twice?

@TomJo2000
Copy link
Member

TomJo2000 commented May 8, 2024

Is it required to configure/make the project twice?

termux_step_post_make_install() {
echo -e "termux - building libsqlite-tcl for arch ${TERMUX_ARCH}..."
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-tcl=${TERMUX_PREFIX}/lib --with-system-sqlite"
TERMUX_PKG_SRCDIR+="/tea"
rm -rf "$TERMUX_PKG_TMPDIR/config-scripts"
termux_step_configure
termux_step_make
termux_step_make_install
}

We're changing configure options for the second build, so we need to rerun the configure step with the new settings.

@twaik
Copy link
Member Author

twaik commented May 8, 2024

Not sure why you called me in for a review, doesn't look like I've ever touched the package, but this looks all fine to me, so I'll just leave some observations.

You touched qbittorrent{,-nox} and I stole the idea.

Is it required to configure/make the project twice?

These are two separate projects in the same repo/tarball. But in the case of subpackage we can use automatic updating.

@TomJo2000
Copy link
Member

TomJo2000 commented May 8, 2024

You touched qbittorrent{,-nox} and I stole the idea.

Touched? I wrote that package build, it hasn't been modified yet.
(And for the record @truboxl told me about this, I just adapted it from libncnn)

TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="
-DNCNN_BUILD_TOOLS=ON
-DNCNN_SHARED_LIB=ON
"
termux_step_configure
termux_step_make
termux_step_make_install

@Biswa96
Copy link
Member

Biswa96 commented May 8, 2024

Is it required to configure/make the project twice?

Answering my own question - it is possible to configure/make once with sqlite-src-xxx.zip file but it requires more changes to the build script.

@TomJo2000
Copy link
Member

Answering my own question - it is possible to configure/make once with sqlite-src-xxx.zip file but it requires more changes to the build script.

Just running the configure -> make -> install steps again in post_make definitely seems easier.

@twaik
Copy link
Member Author

twaik commented May 9, 2024

Ok, I see nobody minds so I am merging it.

@twaik twaik merged commit ecbb6d1 into master May 9, 2024
@twaik twaik deleted the dev/libsqlite-3.45.3 branch May 9, 2024 10:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Enhancement]: making libsqlite-tcl a subpackage of libsqlite
3 participants