-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
python-pyQt5 fixes #22109
python-pyQt5 fixes #22109
Conversation
Well, since travis timed out, I just attempted a build on x86_64-musl, and it succeed. Please note that AFAICT the xlint errors are wrong. |
|
cc92022
to
9964d84
Compare
Fixed this.
This is
It seems to me that there are a variety of different things that could be compiled in the source tree, I think that the |
On 2020-05-21 15:39:32-0700, fosslinux ***@***.***> wrote:
> srcpkgs/python-PyQt5/template:53: indent with tabs
This is `cat`ing to a file, it needs to be spaces.
sed -i -e "53,57s/^ //"
or even:
sed -i -e "53,57s/^ / /"
Does it work after that?
Sorry but PyQt5 website banned my IP range, it seems like.
> srcpkgs/python-PyQt5/template:7: do not set pycompile_module, it is autodetected
> srcpkgs/python-PyQt5/template:100: do not set pycompile_module, it is autodetected
> srcpkgs/python-PyQt5/template:117: do not set pycompile_module, it is autodetected
> srcpkgs/python-PyQt5/template:283: do not set pycompile_module, it is autodetected
It seems to me that there are a variety of different things that
could be compiled in the source tree, I think that the
`pycompile_module`s do need to be there? I sometimes get this wrong,
so please do tell me if you are sure that the pycompile_module
directives should be removed.
Yes, it should be removed.
…--
Danh
|
9964d84
to
649674c
Compare
Ok, done, xlint passes without error now. The build also worked. |
@sgn Would you mind reviewing again? |
My IP is still banned by their host. Sorry, I couldn't test this change. |
Oh, that is quite unfortunate. No pressure, but you could use sources.voidlinux.org, if all that you need to do is get the source code? No problem if you can't though. |
please squash those commits into one |
649674c
to
5e98bf7
Compare
Missed your message. Done |
@Piraty can you review when you have a moment |
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.
do_install()
fails
make: Leaving directory '/builddir/PyQt5-5.13.2/pyqt5-2.7'
mv: cannot stat '/destdir//python-PyQt5-5.13.2/usr/bin//destdir//python-PyQt5-5.13.2/usr/bin/pylupdate5': No such file or directory
=> ERROR: python-PyQt5-5.13.2_2: do_install: 'mv ${DESTDIR}/usr/bin/{,python2-}${f}' exited with 1
=> ERROR: in do_install() at srcpkgs/python-PyQt5/template:80
Huh it used to work. |
- require qt5 in hostmakedepends, otherwise it errors out with an ugly qmake cannot find qt5 error. - hide 'error' message, which isn't really an error but looks ominous. - fix xlint [ci skip]
5e98bf7
to
ac028b7
Compare
I just rebased and built, WFM. Can you try again. |
- require qt5 in hostmakedepends, otherwise it errors out with an ugly qmake cannot find qt5 error. - hide 'error' message, which isn't really an error but looks ominous. - fix xlint [ci skip] Close: void-linux#22109 Co-authored-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
- require qt5 in hostmakedepends, otherwise it errors out with an ugly qmake cannot find qt5 error. - hide 'error' message, which isn't really an error but looks ominous. - fix xlint Co-authored-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Close: void-linux#22109
|
||
pre_build() { | ||
mkdir -p pyqt5-${py2_ver} | ||
mv * pyqt5-${py2_ver} || true | ||
mv * pyqt5-${py2_ver} 2>/dev/null || true |
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.
what is that about? if it fails, why keep it?
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 fails because mv: cannot move 'a' to a subdirectory of itself, 'a/a'
(something like that).
This command is necessary but the error looks like it fails, even though in fact it doesn't.
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 looks like it's trying to move the pyqt5
folder into itself. Could it be filtered from the glob, perhaps? Using find
seems like overkill, but should probably work.
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.
This change is endup merged into part of #24182
Actually, I've never like mv * dst || true
, create_wrksrc
and make a proper tree instead.
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.
create_wrksrc
is probably actually the correct way to go.
Would you like me to create a better version that you can rollup into #24182
Anyway, closing this PR
Superseded by #24182 |
- require qt5 in hostmakedepends, otherwise it errors out with an ugly qmake cannot find qt5 error. - hide 'error' message, which isn't really an error but looks ominous. - fix xlint Co-authored-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Close: void-linux#22109
- require qt5 in hostmakedepends, otherwise it errors out with an ugly qmake cannot find qt5 error. - hide 'error' message, which isn't really an error but looks ominous. - fix xlint Co-authored-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Close: void-linux#22109
- require qt5 in hostmakedepends, otherwise it errors out with an ugly qmake cannot find qt5 error. - hide 'error' message, which isn't really an error but looks ominous. - fix xlint Co-authored-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Close: #22109
It didn't build for me natively on x86_64 because
qmake
couldnt findqt5
on the host. Hence, I added it tohostmakedepends
. LMK if this is the wrong way to do it and it should be patched out instead.There is a
mv
recursive move warning in pre_build that I silenced.I made xlint happy.
Letting travis run, I only tested x86_64 here.