Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 768241 Details for
Bug 649420
dev-qt/qtcore: CXX, CXXFLAGS, LDFLAGS not fully respected
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
qt5-build-respect-flags.patch
qt5-build-respect-flags.patch (text/plain), 3.34 KB, created by
Alex Xu (Hello71)
on 2022-03-31 00:29:51 UTC
(
hide
)
Description:
qt5-build-respect-flags.patch
Filename:
MIME Type:
Creator:
Alex Xu (Hello71)
Created:
2022-03-31 00:29:51 UTC
Size:
3.34 KB
patch
obsolete
>diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass >index 279ece28e1d..f1c5a977c2c 100644 >--- a/eclass/qt5-build.eclass >+++ b/eclass/qt5-build.eclass >@@ -192,32 +192,14 @@ qt5-build_src_prepare() { > fi > > if [[ ${QT5_MODULE} == qtbase ]]; then >- qt5_symlink_tools_to_build_dir >- >- # Avoid unnecessary qmake recompilations >- sed -i -e "/Creating qmake/i if [ '!' -e \"\$outpath/bin/qmake\" ]; then" \ >- -e '/echo "Done."/a fi' configure || die "sed failed (skip qmake bootstrap)" >- >- # Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake >- sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s|)| \ >- ${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \ >- 'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&|" \ >- -e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \ >- configure || die "sed failed (respect env for qmake build)" >- sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \ >- qmake/Makefile.unix || die "sed failed (CPPFLAGS for qmake build)" >- >- # Respect CXX in bsymbolic_functions, fvisibility, precomp, and a few other tests >- sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \ >- configure || die "sed failed (QMAKE_CONF_COMPILER)" >- >- # Respect build variables in configure tests (bug #639494) >- sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die >+ sed -i -e 's/EXTRA_CXXFLAGS/CONFIG_CXXFLAGS/' -e 's/EXTRA_LFLAGS/CONFIG_LFLAGS/' configure || die > fi > > [[ -n ${QT5_KDEPATCHSET_REV} ]] && eapply "${WORKDIR}/${QT5_MODULE}-${PV}-gentoo-kde-${QT5_KDEPATCHSET_REV}" > > default >+ >+ mkdir "${QT5_BUILD_DIR}" > } > > # @FUNCTION: qt5-build_src_configure >@@ -240,6 +222,11 @@ qt5-build_src_configure() { > # Runs emake in the target directories. > qt5-build_src_compile() { > qt5_foreach_target_subdir emake >+ if [[ ${PN} == qtcore ]]; then >+ pushd "${QT5_BUILD_DIR}" >/dev/null || die >+ emake sub-qmake-qmake-aux-pro >+ popd >/dev/null || die >+ fi > } > > # @FUNCTION: qt5-build_src_test >@@ -498,30 +485,6 @@ qt5_foreach_target_subdir() { > done > } > >-# @FUNCTION: qt5_symlink_tools_to_build_dir >-# @INTERNAL >-# @DESCRIPTION: >-# Symlinks qmake and a few other tools to QT5_BUILD_DIR, >-# so that they can be used when building other modules. >-qt5_symlink_tools_to_build_dir() { >- local tool= tools=() >- if [[ ${PN} != qtcore ]]; then >- tools+=(qmake moc rcc qlalr) >- [[ ${PN} != qtdbus ]] && tools+=(qdbuscpp2xml qdbusxml2cpp) >- [[ ${PN} != qtwidgets ]] && tools+=(uic) >- fi >- >- mkdir -p "${QT5_BUILD_DIR}"/bin || die >- pushd "${QT5_BUILD_DIR}"/bin >/dev/null || die >- >- for tool in "${tools[@]}"; do >- [[ -e ${QT5_BINDIR}/${tool} ]] || continue >- ln -s "${QT5_BINDIR}/${tool}" . || die "failed to symlink ${tool}" >- done >- >- popd >/dev/null || die >-} >- > # @FUNCTION: qt5_base_configure > # @INTERNAL > # @DESCRIPTION: >@@ -530,6 +493,8 @@ qt5_base_configure() { > # setup toolchain variables used by configure > tc-export AR CC CXX OBJDUMP RANLIB STRIP > export LD="$(tc-getCXX)" >+ export EXTRA_CXXFLAGS="${CXXFLAGS}" >+ export EXTRA_LFLAGS="${LDFLAGS}" > > # bug 633838 > unset QMAKESPEC XQMAKESPEC QMAKEPATH QMAKEFEATURES >@@ -687,6 +652,8 @@ qt5_base_configure() { > "${myconf[@]}" > ) > >+ eval "conf+=($(qt5_qmake_args))" >+ > pushd "${QT5_BUILD_DIR}" >/dev/null || die > > einfo "Configuring with: ${conf[@]}"
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 649420
:
768241
|
768242