LyXConfigureOptions="${LyXConfigureOptions} --disable-stdlib-debug"
AspellConfigureOptions="--enable-warnings --enable-optimization=-O0 --enable-debug --disable-nls --enable-compile-in-filters --disable-pspell-compatibility"
HunspellConfigureOptions="--with-warnings --disable-nls --disable-static"
-Qt4ConfigureOptions="${Qt4ConfigureOptions} -opensource -silent -shared -fast -no-exceptions"
+Qt4ConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -fast -no-exceptions"
Qt4ConfigureOptions="${Qt4ConfigureOptions} -no-webkit -no-qt3support -no-javascript-jit -no-dbus"
Qt4ConfigureOptions="${Qt4ConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
case "${Qt4Version}:${Qt4API}" in
4.6*:-carbon)
;;
+5.0*)
+ Qt4ConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -fast -no-strip"
+ Qt4ConfigureOptions="${Qt4ConfigureOptions} -no-javascript-jit -no-pkg-config"
+ Qt4ConfigureOptions="${Qt4ConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
+ ;;
*)
Qt4ConfigureOptions="${Qt4ConfigureOptions} ${Qt4API}"
;;
exit 0
}
+NCPU=$(sysctl -n hw.ncpu)
+NCPU=$((NCPU / 2))
+if [ $NCPU -gt 1 ]; then
+ MAKEJOBS=-j${NCPU}
+fi
+
while [ $# -gt 0 ]; do
case "${1}" in
--with-qt4-frameworks=*)
if [ "${configure_qt4_frameworks}" != "yes" ]; then
QtInstallDir=${QTDIR:-"/opt/qt4"}
fi
-QtFrameworkVersion="4"
ARCH_LIST=${ARCH_LIST:-"ppc i386"}
# ---------------------------------
# don't change order here...
-QtLibraries="QtSvg QtXml QtGui QtNetwork QtCore"
+case "${Qt4Version}" in
+5*)
+ QtLibraries="QtSvg QtXml QtPrintSupport QtWidgets QtGui QtNetwork QtConcurrent QtCore"
+ QtFrameworkVersion="5"
+ ;;
+*)
+ QtLibraries="QtSvg QtXml QtGui QtNetwork QtCore"
+ QtFrameworkVersion="4"
+ ;;
+esac
DMGNAME="${LyxBase}"
DMGSIZE="550m"
echo configure options:
echo ${Qt4ConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
echo yes | "${Qt4SourceDir}"/configure ${Qt4ConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
- make && make install
+ make ${MAKEJOBS} && make install
)
cd "${QtInstallDir}" && (
mkdir -p include
${QtInstallDir:+"--with-qt4-dir=${QtInstallDir}"} \
${LyXConfigureOptions}\
--enable-build-type=rel && \
- NCPU=$(sysctl -n hw.ncpu)
- NCPU=$((NCPU / 2))
- if [ $NCPU -gt 1 ]; then
- NUMJOBS=-j${NCPU}
- fi
- make ${NUMJOBS} && make install${strip}
+ make ${MAKEJOBS} && make install${strip}
for file in ${LYX_FILE_LIST} ; do
if [ -f "${LYX_BUNDLE_PATH}/${file}" ]; then
mv "${LYX_BUNDLE_PATH}/${file}"\