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

[bsdiff_classic] Update Bzip2 compat #9648

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

nhz2
Copy link
Contributor

@nhz2 nhz2 commented Oct 19, 2024

This will help testing JuliaIO/BSDiff.jl#49

@@ -3,11 +3,11 @@
using BinaryBuilder, Pkg

name = "bsdiff_classic"
version = v"4.3.0"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Does this need to be updated or should I leave it as 4.3.0?

Copy link
Member

Choose a reason for hiding this comment

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

You do need to change the version number if compat bounds change (and you changed also the julia one below)

Copy link
Member

@giordano giordano left a comment

Choose a reason for hiding this comment

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

You may want to trigger a rebuild of Bzip2 in a separate PR, so that we get it built for aarch64-freebsd (hopefully that works out-of-the-box without much hassle)

B/bsdiff_classic/build_tarballs.jl Outdated Show resolved Hide resolved
@@ -3,11 +3,11 @@
using BinaryBuilder, Pkg

name = "bsdiff_classic"
version = v"4.3.0"
Copy link
Member

Choose a reason for hiding this comment

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

You do need to change the version number if compat bounds change (and you changed also the julia one below)

@nhz2 nhz2 marked this pull request as ready for review October 19, 2024 17:50
@giordano
Copy link
Member

License file is missing

@nhz2 nhz2 marked this pull request as draft October 19, 2024 18:26
@nhz2
Copy link
Contributor Author

nhz2 commented Oct 20, 2024

License file is missing

Nice catch.
I don't see a specific license file, so I'm adding the two ".c" files with a license at the top.

@nhz2 nhz2 marked this pull request as ready for review October 20, 2024 01:24
@@ -17,6 +17,7 @@ perl -i -ple '$_ = "#include <sys/types.h>\n" . $_ if $. == 31' bspatch.c
cc -O3 -lbz2 -I"${prefix}/include" bsdiff.c -o bsdiff
cc -O3 -lbz2 -I"${prefix}/include" bspatch.c -o bspatch
install bsdiff bspatch "${bindir}"
install_license bsdiff.c bspatch.c
Copy link
Member

Choose a reason for hiding this comment

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

Using source code as license file isn't a great idea. That seems to be 2-clause BSD, we have that somewhere in the rootfs

Copy link
Member

Choose a reason for hiding this comment

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

It should be

Suggested change
install_license bsdiff.c bspatch.c
install_license /usr/share/licenses/BSD2

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