Skip to content

task: update to 3.4.2#59569

Open
Swiddis wants to merge 1 commit intovoid-linux:masterfrom
Swiddis:feat/update-task
Open

task: update to 3.4.2#59569
Swiddis wants to merge 1 commit intovoid-linux:masterfrom
Swiddis:feat/update-task

Conversation

@Swiddis
Copy link
Copy Markdown
Contributor

@Swiddis Swiddis commented Mar 25, 2026

Needs git now because of the source bundling a corrosion submodule -- we could also provide corrosion as a system dependency, since we happen to ship the same 0.5.2 version they need, but this will break if we update corrosion (I tried) Fixed -- just use the corrosion from the source tar

Testing the changes

  • I tested the changes in this PR: YES

Local build testing

  • I built this PR locally for my native architecture, x86_64-libc
  • I built this PR locally for these architectures (if supported. mark crossbuilds):
    • x86_64-musl

@Swiddis Swiddis force-pushed the feat/update-task branch 2 times, most recently from b9cf088 to d12dd5a Compare March 25, 2026 05:22
Copy link
Copy Markdown
Member

@Duncaen Duncaen left a comment

Choose a reason for hiding this comment

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

We generally use extra distfiles for submodules since we don't have anything to cache git pulls in xbps-src, see srcpkgs/gamescope/template as example.

@Swiddis Swiddis force-pushed the feat/update-task branch 2 times, most recently from 76ef93f to a004618 Compare March 28, 2026 02:31
@Swiddis
Copy link
Copy Markdown
Contributor Author

Swiddis commented Mar 28, 2026

Even better: Figured out how to persuade cmake to use the corrosion src bundled in the tar without trying to re-fetch.

(Is there a better way to reference the package src dir than ${XBPS_BUILDDIR}/${pkgname}-${version}? I scanned the manual, it looks like wrksrc is what I want but it's not set during the header's variable init)

@Swiddis Swiddis requested a review from Duncaen March 28, 2026 02:44
@Duncaen
Copy link
Copy Markdown
Member

Duncaen commented Mar 28, 2026

Even better: Figured out how to persuade cmake to use the corrosion src bundled in the tar without trying to re-fetch.

(Is there a better way to reference the package src dir than ${XBPS_BUILDDIR}/${pkgname}-${version}? I scanned the manual, it looks like wrksrc is what I want but it's not set during the header's variable init)

Not really since the directory name is technically not known before extracting the distfiles.

some packages just do something like:

pre_configure() {
	configure_args+=" -DPYCXX_INCLUDE_DIR=${wrksrc}/pycxx
	 -DPYCXX_SOURCE_DIR=${wrksrc}/pycxx/Src"
}

grep -r configure_args srcpkgs|grep wrksrc

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.

2 participants