Lines 321-326
Link Here
|
321 |
|
321 |
|
322 |
qt5_install_module_qconfigs |
322 |
qt5_install_module_qconfigs |
323 |
prune_libtool_files |
323 |
prune_libtool_files |
|
|
324 |
|
325 |
# There is no way to teach the build system to play nicely |
326 |
# with the slightly different directory layout on cygwin. |
327 |
# Note: cygwinports does it like that, too. |
328 |
if use elibc_Cygwin; then |
329 |
dodir /usr/bin |
330 |
mv "${D}"$EPREFIX/usr/lib/*.dll "${D}"$EPREFIX/usr/bin/ |
331 |
fi |
324 |
} |
332 |
} |
325 |
|
333 |
|
326 |
# @FUNCTION: qt5-build_pkg_postinst |
334 |
# @FUNCTION: qt5-build_pkg_postinst |
Lines 699-705
Link Here
|
699 |
# @DESCRIPTION: |
707 |
# @DESCRIPTION: |
700 |
# Helper function to get the various toolchain-related variables. |
708 |
# Helper function to get the various toolchain-related variables. |
701 |
qt5_qmake_args() { |
709 |
qt5_qmake_args() { |
702 |
echo \ |
710 |
echo -n \ |
703 |
QMAKE_AR=\"$(tc-getAR)\" \ |
711 |
QMAKE_AR=\"$(tc-getAR)\" \ |
704 |
QMAKE_CC=\"$(tc-getCC)\" \ |
712 |
QMAKE_CC=\"$(tc-getCC)\" \ |
705 |
QMAKE_LINK_C=\"$(tc-getCC)\" \ |
713 |
QMAKE_LINK_C=\"$(tc-getCC)\" \ |
Lines 710-724
Link Here
|
710 |
QMAKE_OBJCOPY=\"$(tc-getOBJCOPY)\" \ |
718 |
QMAKE_OBJCOPY=\"$(tc-getOBJCOPY)\" \ |
711 |
QMAKE_RANLIB= \ |
719 |
QMAKE_RANLIB= \ |
712 |
QMAKE_STRIP=\"$(tc-getSTRIP)\" \ |
720 |
QMAKE_STRIP=\"$(tc-getSTRIP)\" \ |
713 |
QMAKE_CFLAGS=\"${CFLAGS}\" \ |
|
|
714 |
QMAKE_CFLAGS_RELEASE= \ |
721 |
QMAKE_CFLAGS_RELEASE= \ |
715 |
QMAKE_CFLAGS_DEBUG= \ |
722 |
QMAKE_CFLAGS_DEBUG= \ |
716 |
QMAKE_CXXFLAGS=\"${CXXFLAGS}\" \ |
|
|
717 |
QMAKE_CXXFLAGS_RELEASE= \ |
723 |
QMAKE_CXXFLAGS_RELEASE= \ |
718 |
QMAKE_CXXFLAGS_DEBUG= \ |
724 |
QMAKE_CXXFLAGS_DEBUG= \ |
719 |
QMAKE_LFLAGS=\"${LDFLAGS}\" \ |
|
|
720 |
QMAKE_LFLAGS_RELEASE= \ |
725 |
QMAKE_LFLAGS_RELEASE= \ |
721 |
QMAKE_LFLAGS_DEBUG= |
726 |
QMAKE_LFLAGS_DEBUG= |
|
|
727 |
if use elibc_Cygwin; then |
728 |
# The specs for cygwin add some crucial FLAGS that must not |
729 |
# be thrown away. Better add the environment flags, so the |
730 |
# specs flags can still be overridden. |
731 |
echo \ |
732 |
QMAKE_CFLAGS+=\"${CFLAGS}\" \ |
733 |
QMAKE_CXXFLAGS+=\"${CXXFLAGS}\" \ |
734 |
QMAKE_LFLAGS+=\"${LDFLAGS}\" |
735 |
else |
736 |
echo \ |
737 |
QMAKE_CFLAGS=\"${CFLAGS}\" \ |
738 |
QMAKE_CXXFLAGS=\"${CXXFLAGS}\" \ |
739 |
QMAKE_LFLAGS=\"${LDFLAGS}\" |
740 |
fi |
722 |
} |
741 |
} |
723 |
|
742 |
|
724 |
# @FUNCTION: qt5_qmake |
743 |
# @FUNCTION: qt5_qmake |
Lines 729-739
Link Here
|
729 |
qt5_qmake() { |
748 |
qt5_qmake() { |
730 |
local projectdir=${PWD/#${QT5_BUILD_DIR}/${S}} |
749 |
local projectdir=${PWD/#${QT5_BUILD_DIR}/${S}} |
731 |
local qmakepath= |
750 |
local qmakepath= |
|
|
751 |
local qmakeopts=( |
752 |
QMAKE_CFLAGS=\"${CFLAGS}\" |
753 |
QMAKE_CXXFLAGS=\"${CXXFLAGS}\" |
754 |
QMAKE_LFLAGS=\"${LDFLAGS}\" |
755 |
) |
732 |
if [[ ${QT5_MODULE} == qtbase ]]; then |
756 |
if [[ ${QT5_MODULE} == qtbase ]]; then |
733 |
qmakepath=${QT5_BUILD_DIR}/bin |
757 |
qmakepath=${QT5_BUILD_DIR}/bin |
734 |
else |
758 |
else |
735 |
qmakepath=${QT5_BINDIR} |
759 |
qmakepath=${QT5_BINDIR} |
736 |
fi |
760 |
fi |
|
|
761 |
if use elibc_Cygwin; then |
762 |
# The specs for cygwin add some crucial FLAGS that must not |
763 |
# be thrown away. Better add the environment flags, so the |
764 |
# specs flags can still be overridden. |
765 |
qmakeopts=( |
766 |
QMAKE_CFLAGS+=\"${CFLAGS}\" |
767 |
QMAKE_CXXFLAGS+=\"${CXXFLAGS}\" |
768 |
QMAKE_LFLAGS+=\"${LDFLAGS}\" |
769 |
) |
770 |
fi |
737 |
|
771 |
|
738 |
"${qmakepath}"/qmake \ |
772 |
"${qmakepath}"/qmake \ |
739 |
"${projectdir}" \ |
773 |
"${projectdir}" \ |
Lines 749-763
Link Here
|
749 |
QMAKE_OBJCOPY="$(tc-getOBJCOPY)" \ |
783 |
QMAKE_OBJCOPY="$(tc-getOBJCOPY)" \ |
750 |
QMAKE_RANLIB= \ |
784 |
QMAKE_RANLIB= \ |
751 |
QMAKE_STRIP="$(tc-getSTRIP)" \ |
785 |
QMAKE_STRIP="$(tc-getSTRIP)" \ |
752 |
QMAKE_CFLAGS="${CFLAGS}" \ |
|
|
753 |
QMAKE_CFLAGS_RELEASE= \ |
786 |
QMAKE_CFLAGS_RELEASE= \ |
754 |
QMAKE_CFLAGS_DEBUG= \ |
787 |
QMAKE_CFLAGS_DEBUG= \ |
755 |
QMAKE_CXXFLAGS="${CXXFLAGS}" \ |
|
|
756 |
QMAKE_CXXFLAGS_RELEASE= \ |
788 |
QMAKE_CXXFLAGS_RELEASE= \ |
757 |
QMAKE_CXXFLAGS_DEBUG= \ |
789 |
QMAKE_CXXFLAGS_DEBUG= \ |
758 |
QMAKE_LFLAGS="${LDFLAGS}" \ |
|
|
759 |
QMAKE_LFLAGS_RELEASE= \ |
790 |
QMAKE_LFLAGS_RELEASE= \ |
760 |
QMAKE_LFLAGS_DEBUG= \ |
791 |
QMAKE_LFLAGS_DEBUG= \ |
|
|
792 |
"${qmakeopts[@]}" \ |
761 |
"${myqmakeargs[@]}" \ |
793 |
"${myqmakeargs[@]}" \ |
762 |
|| die "qmake failed (${projectdir#${S}/})" |
794 |
|| die "qmake failed (${projectdir#${S}/})" |
763 |
} |
795 |
} |