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
New package: sane-airscan-0.99.24 #29627
Conversation
Duplicate of #29392, but I haven't looked at the difference between the templates yet. |
#29392 uses meson and this uses make. |
In case people prefer to go with my version (make) rather than #29392 (meson), I just added the line to shlibs that I had forgotten... ...my template had to define the |
srcpkgs/sane-airscan/template
Outdated
: ${make_cmd:=make} | ||
: ${make_install_target:=install} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's okay to hardcode these in the command. What you might be able to do is add make_install_args="STRIP=echo"
or use some conditionals to get the correct strip
for cross and native compilation there.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ericonr, thanks for the suggestion! Indeed I could get around defining a custom do_install()
by setting $make_install_args="STRIP=-s"
...
However, Makefile uses $(STRIP)
as options to install
:
https://github.com/alexpevzner/sane-airscan/blob/master/Makefile#L118-L132
and defaults to -s
(which instructs install
to strip):
https://github.com/alexpevzner/sane-airscan/blob/master/Makefile#L30-L35
so, for cross-compilation, I think we would need to override $(INSTALL)
with target-linux-gnu-install
~ which could be a nice addition to the gnu-makefile build style, as it already does many similar overrides for CC
, LD
and friends.
What do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's actually install --strip-program=target-linux-gnu-strip
. Would be a bit strange to have platform-specific install
...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can do STRIP=-s
, because we have an install
wrapper that removes the flag anyway :p So you don't need to care about passing the correct --strip-program
:)
We do the stripping ourselves, to generate debug packages. I quite dislike build systems that try to strip binaries themselves, tbh.
Maybe report it upstream, but the makefile version is missing the unversioned symlink:
|
39a0e69
to
86e6b39
Compare
I submitted a PR, but upstream didn't like the unversioned symlink, and also shared that they don't really maintain the meson build, but just try to not break it ~ sounds like they prefer make. Their full response:
|
In that case, I think we should go with the Makefile based build. |
srcpkgs/sane-airscan/template
Outdated
make_install_args="STRIP=" | ||
hostmakedepends="pkg-config" | ||
makedepends="avahi-libs-devel sane-devel gnutls-devel libxml2-devel libjpeg-turbo-devel libpng-devel" | ||
short_desc="SANE driver for Apple AirScan" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you make the description closer to what's used by upstream?
Scanner Access Now Easy - universal driver for eSCL (Apple AirScan) and WSD
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
✨
Wooh! |
General
Have the results of the proposed changes been tested?