tcc: update to 0.9.28 & simpler build.sh #19167

be2020 · 2024-02-06T19:47:39Z

Also fixes #19055

MyNameIsTrez · 2024-02-08T02:18:19Z

I downloaded termux an hour ago and immediately ran into this issue with tcc. Thanks for fixing it!

packages/tcc/build.sh

TomJo2000

Great work, I don't see any functional issues,
I have a couple minor style suggestions though to put the build.sh more in line with common conventions.

TomJo2000 · 2024-02-26T10:31:31Z

packages/tcc/build.sh

+TERMUX_PKG_VERSION=1:0.9.28-p${_COMMIT_DATE}
 TERMUX_PKG_SRCURL=git+https://repo.or.cz/tinycc.git
-TERMUX_PKG_SHA256=467792219d0172f594ec71bcd6bac9dbb25308cbe9f708bab455b717148b491b
+TERMUX_PKG_SHA256=$_COMMIT_SHA256


Suggested change

TERMUX_PKG_SHA256=$_COMMIT_SHA256

TERMUX_PKG_SHA256=26974776737d9da876395cc72a005a63526e305aeaa28ebf84c56778a8d9fdac

Since $_COMMIT_SHA256 is only ever used as the value of $TERMUX_PKG_SHA256,
why have it as a separate variable in the first place?

TomJo2000 · 2024-02-26T10:36:13Z

packages/tcc/build.sh

+_COMMIT=4e91d38ddcdb659a4b2c298850c6ccf115073748
+_COMMIT_DATE=20240225
+_COMMIT_SHA256=26974776737d9da876395cc72a005a63526e305aeaa28ebf84c56778a8d9fdac
+


Suggested change

_COMMIT=4e91d38ddcdb659a4b2c298850c6ccf115073748

_COMMIT_DATE=20240225

_COMMIT_SHA256=26974776737d9da876395cc72a005a63526e305aeaa28ebf84c56778a8d9fdac

TomJo2000 · 2024-02-26T10:37:12Z

packages/tcc/build.sh

-_COMMIT_DATE=20230415
-TERMUX_PKG_VERSION=1:0.9.27-p${_COMMIT_DATE}
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=1:0.9.28-p${_COMMIT_DATE}


Suggested change

TERMUX_PKG_VERSION=1:0.9.28-p${_COMMIT_DATE}

_COMMIT=4e91d38ddcdb659a4b2c298850c6ccf115073748

_COMMIT_DATE=20240225

TERMUX_PKG_VERSION=1:0.9.28-p${_COMMIT_DATE}

_COMMIT and _COMMIT_DATE are usually inlined with the TERMUX_PKG_* variables.
For an example see:

termux-packages/packages/tmux/build.sh

Lines 5 to 9 in b6e127f

_COMMIT=fbe6fe7f55cfc2a32f9cee4cb50502a53d3ce8bb

_COMMIT_DATE=20230428

TERMUX_PKG_VERSION=3.3a-p${_COMMIT_DATE}

TERMUX_PKG_SRCURL=git+https://github.com/tmux/tmux

TERMUX_PKG_SHA256=b61189533139bb84bdc0e96546a5420c183d7ba946a559e891d313c1c32d953d

Although I don't believe this is a "rule" in the guidelines.
It's just a convention most other occurences of these variables in build scripts seem to follow.

0.9.28 is also a release candidate version not stable version for now. So I suggest you use TERMUX_PKG_VERSION=1:0.9.28~p${_COMMIT_DATE} instead.

I really think we should move back to archive tarball once 0.9.28 is declared stable. https://download.savannah.nongnu.org/releases/tinycc/

There's no real advantage of using git clone unless need to pull some submodules dependencies.

TomJo2000 · 2024-02-26T10:39:38Z

packages/tcc/build.sh

-		ANDROID_LIB_PATH="/system/lib64:/system/vendor/lib64"
-	fi
+	# override default step
+        echo "running on : $(uname -a)"


Was this meant to be left in here?
Or is this just a leftover debugging aid.

Both (if you want to).

Well in the CI the runs get separated by architecture anyway, so this really is only somewhat useful for local test builds.

Well, long story: Because of package.yml: "Setup arm and aarch64 CPU emulators" I got curious whether the "stage 1" tcc would maybe run in qemu. As it turns out it doesn't, it's always a x86_64 executable, regardless of the final package architecture. Indeed we don't really have to know that, as long as there aren't any problems ...

The qemu was never used anywhere. It also need a Android linker to work. So you can remove it.

Unresolving, since its still there.

packages/tcc/build.sh

twaik · 2024-10-18T11:33:19Z

@be2020 can you please rebase this PR to current master and change files as suggested?

be2020 · 2024-10-22T21:35:48Z

rebased & changes applied ...

twaik · 2024-10-22T22:19:46Z

packages/tcc/build.sh

-		ANDROID_LIB_PATH="/system/lib64:/system/vendor/lib64"
-	fi
+	# override default step
+	true


Usually we put : for empty build steps, with no comments.

twaik · 2024-10-23T00:08:51Z

So there are two pending problems (build script related) to be resolved.

Let termux do the "make install" (as suggested). Also. use most recent upstream commit.

- remove merely informative line from termux_step_configure() - use '~' in TERMUX_PKG_VERSION to indicate release candidate - fetch the latest tinycc commit & remove redundant patch

be2020 requested review from Grimler91 and finagolfin as code owners February 6, 2024 19:47

be2020 force-pushed the update-tcc branch from c42ed62 to c228447 Compare February 7, 2024 22:16

Grimler91 reviewed Feb 11, 2024

View reviewed changes

packages/tcc/build.sh Outdated Show resolved Hide resolved

be2020 force-pushed the update-tcc branch from 70db228 to 9efbca8 Compare February 25, 2024 22:35

TomJo2000 reviewed Feb 26, 2024

View reviewed changes

be2020 force-pushed the update-tcc branch from 9efbca8 to 887980c Compare October 22, 2024 21:27

twaik requested changes Oct 22, 2024

View reviewed changes

be2020 added 3 commits October 23, 2024 03:09

tcc: update to 0.9.28 & simpler build.sh

06346f0

tcc: update to 0.9.28 & even simpler build.sh

c3d04da

Let termux do the "make install" (as suggested). Also. use most recent upstream commit.

tcc: update to 0.9.28 : rebase and apply suggested changes

e4bd6c1

- remove merely informative line from termux_step_configure() - use '~' in TERMUX_PKG_VERSION to indicate release candidate - fetch the latest tinycc commit & remove redundant patch

twaik force-pushed the update-tcc branch from 887980c to e4bd6c1 Compare October 23, 2024 00:09

	TERMUX_PKG_SHA256=$_COMMIT_SHA256
	TERMUX_PKG_SHA256=26974776737d9da876395cc72a005a63526e305aeaa28ebf84c56778a8d9fdac

	_COMMIT=4e91d38ddcdb659a4b2c298850c6ccf115073748
	_COMMIT_DATE=20240225
	_COMMIT_SHA256=26974776737d9da876395cc72a005a63526e305aeaa28ebf84c56778a8d9fdac

	_COMMIT=fbe6fe7f55cfc2a32f9cee4cb50502a53d3ce8bb
	_COMMIT_DATE=20230428
	TERMUX_PKG_VERSION=3.3a-p${_COMMIT_DATE}
	TERMUX_PKG_SRCURL=git+https://github.com/tmux/tmux
	TERMUX_PKG_SHA256=b61189533139bb84bdc0e96546a5420c183d7ba946a559e891d313c1c32d953d

Uh oh!

tcc: update to 0.9.28 & simpler build.sh #19167

Are you sure you want to change the base?

tcc: update to 0.9.28 & simpler build.sh #19167

Uh oh!

Conversation

be2020 commented Feb 6, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MyNameIsTrez commented Feb 8, 2024

Uh oh!

Uh oh!

TomJo2000 left a comment

Choose a reason for hiding this comment

Uh oh!

TomJo2000 Feb 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

TomJo2000 Apr 2, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

twaik commented Oct 18, 2024

Uh oh!

be2020 commented Oct 22, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

twaik commented Oct 23, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

be2020 commented Feb 6, 2024 •

edited

Loading

TomJo2000 Feb 26, 2024 •

edited

Loading

TomJo2000 Apr 2, 2024 •

edited

Loading