* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
@ 2014-11-13 1:45 Davide Pesavento (pesa)
0 siblings, 0 replies; 19+ messages in thread
From: Davide Pesavento (pesa) @ 2014-11-13 1:45 UTC (permalink / raw
To: gentoo-commits
pesa 14/11/13 01:45:07
Modified: ChangeLog
Added: qt4-build-multilib.eclass
Log:
Initial commit of qt4-build-multilib.eclass
Revision Changes Path
1.1416 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1416&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1416&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1415&r2=1.1416
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1415
retrieving revision 1.1416
diff -u -r1.1415 -r1.1416
--- ChangeLog 12 Nov 2014 23:26:36 -0000 1.1415
+++ ChangeLog 13 Nov 2014 01:45:07 -0000 1.1416
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1415 2014/11/12 23:26:36 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1416 2014/11/13 01:45:07 pesa Exp $
+
+ 13 Nov 2014; Davide Pesavento <pesa@gentoo.org> +qt4-build-multilib.eclass:
+ Initial commit of qt4-build-multilib.eclass
12 Nov 2014; Patrice Clement <monsieurp@gentoo.org> perl-module.eclass:
Documented nearly all functions.
1.1 eclass/qt4-build-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.1&content-type=text/plain
Index: qt4-build-multilib.eclass
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.1 2014/11/13 01:45:07 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
# Qt herd <qt@gentoo.org>
# @AUTHOR:
# Davide Pesavento <pesa@gentoo.org>
# @BLURB: Eclass for Qt4 split ebuilds with multilib support.
# @DESCRIPTION:
# This eclass contains various functions that are used when building Qt4.
# Requires EAPI 5.
case ${EAPI} in
5) : ;;
*) die "qt4-build-multilib.eclass: unsupported EAPI=${EAPI:-0}" ;;
esac
inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
HOMEPAGE="https://www.qt.io/ https://qt-project.org/"
LICENSE="|| ( LGPL-2.1 GPL-3 )"
SLOT="4"
case ${PV} in
4.?.9999)
QT4_BUILD_TYPE="live"
EGIT_REPO_URI=(
"git://gitorious.org/qt/qt.git"
"https://git.gitorious.org/qt/qt.git"
)
EGIT_BRANCH=${PV%.9999}
inherit git-r3
;;
*)
QT4_BUILD_TYPE="release"
MY_P=qt-everywhere-opensource-src-${PV/_/-}
SRC_URI="http://download.qt-project.org/archive/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
S=${WORKDIR}/${MY_P}
;;
esac
if [[ ${PN} != qttranslations ]]; then
IUSE="aqua debug pch"
[[ ${PN} != qtxmlpatterns ]] && IUSE+=" +exceptions"
fi
DEPEND="
dev-lang/perl
virtual/pkgconfig[${MULTILIB_USEDEP}]
"
RDEPEND="
dev-qt/qtchooser
"
# src_{configure,compile,test,install} are inherited from multilib-minimal
EXPORT_FUNCTIONS src_unpack src_prepare pkg_postinst pkg_postrm
multilib_src_configure() { qt4_multilib_src_configure; }
multilib_src_compile() { qt4_multilib_src_compile; }
multilib_src_test() { qt4_multilib_src_test; }
multilib_src_install() { qt4_multilib_src_install; }
multilib_src_install_all() { qt4_multilib_src_install_all; }
# @ECLASS-VARIABLE: PATCHES
# @DEFAULT_UNSET
# @DESCRIPTION:
# Array variable containing all the patches to be applied. This variable
# is expected to be defined in the global scope of ebuilds. Make sure to
# specify the full path. This variable is used in src_prepare phase.
#
# Example:
# @CODE
# PATCHES=(
# "${FILESDIR}/mypatch.patch"
# "${FILESDIR}/mypatch2.patch"
# )
# @CODE
# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
# @DEFAULT_UNSET
# @DESCRIPTION:
# Space-separated list of directories that will be configured,
# compiled, and installed. All paths must be relative to ${S}.
# @ECLASS-VARIABLE: QT4_VERBOSE_BUILD
# @DESCRIPTION:
# Set to false to reduce build output during compilation.
: ${QT4_VERBOSE_BUILD:=true}
# @ECLASS-VARIABLE: QCONFIG_ADD
# @DEFAULT_UNSET
# @DESCRIPTION:
# List of options that must be added to QT_CONFIG in qconfig.pri
# @ECLASS-VARIABLE: QCONFIG_REMOVE
# @DEFAULT_UNSET
# @DESCRIPTION:
# List of options that must be removed from QT_CONFIG in qconfig.pri
# @ECLASS-VARIABLE: QCONFIG_DEFINE
# @DEFAULT_UNSET
# @DESCRIPTION:
# List of macros that must be defined in QtCore/qconfig.h
# @FUNCTION: qt4-build-multilib_src_unpack
# @DESCRIPTION:
# Unpacks the sources.
qt4-build-multilib_src_unpack() {
if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ]]; then
ewarn
ewarn "Using a GCC version lower than 4.4 is not supported."
ewarn
fi
if [[ ${PN} == qtwebkit ]]; then
eshopts_push -s extglob
if is-flagq '-g?(gdb)?([1-9])'; then
ewarn
ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
ewarn "You may experience really long compilation times and/or increased memory usage."
ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
ewarn "For more info check out https://bugs.gentoo.org/307861"
ewarn
fi
eshopts_pop
fi
case ${QT4_BUILD_TYPE} in
live) git-r3_src_unpack ;;
release) default ;;
esac
}
# @FUNCTION: qt4-build-multilib_src_prepare
# @DESCRIPTION:
# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
# the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in make.conf.
qt4-build-multilib_src_prepare() {
if [[ ${PN} != qtcore ]]; then
# avoid unnecessary qmake recompilations
sed -i -e 's/^if true;/if false;/' configure \
|| die "sed failed (skip qmake bootstrap)"
fi
# skip X11 tests in non-gui packages to avoid spurious dependencies
if has ${PN} qtbearer qtcore qtdbus qtscript qtsql qttest qttranslations qtxmlpatterns; then
sed -i -e '/^if.*PLATFORM_X11.*CFG_GUI/,/^fi$/d' configure \
|| die "sed failed (skip X11 tests)"
fi
if use_if_iuse aqua; then
sed -i \
-e '/^CONFIG/s:app_bundle::' \
-e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
mkspecs/$(qt4_get_mkspec)/qmake.conf \
|| die "sed failed (aqua)"
# we are crazy and build cocoa + qt3support
if { ! in_iuse qt3support || use qt3support; } && [[ ${CHOST##*-darwin} -ge 9 ]]; then
sed -i -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
configure || die "sed failed (cocoa + qt3support)"
fi
fi
# Bug 261632
if use ppc64; then
append-flags -mminimal-toc
fi
# Bug 373061
# qmake bus errors with -O2 or -O3 but -O1 works
if [[ ${CHOST} == *86*-apple-darwin* ]]; then
replace-flags -O[23] -O1
fi
# Bug 417105
# graphite on gcc 4.7 causes miscompilations
if [[ $(gcc-version) == "4.7" ]]; then
filter-flags -fgraphite-identity
fi
# Read also AR from the environment
sed -i -e 's/^SYSTEM_VARIABLES="/&AR /' \
configure || die "sed SYSTEM_VARIABLES failed"
# Reset QMAKE_*FLAGS_{RELEASE,DEBUG} variables,
# or they will override user's flags (.qmake.cache)
sed -i -e '/^SYSTEM_VARIABLES=/ i \
QMakeVar set QMAKE_CFLAGS_RELEASE\
QMakeVar set QMAKE_CFLAGS_DEBUG\
QMakeVar set QMAKE_CXXFLAGS_RELEASE\
QMakeVar set QMAKE_CXXFLAGS_DEBUG\
QMakeVar set QMAKE_LFLAGS_RELEASE\
QMakeVar set QMAKE_LFLAGS_DEBUG\n' \
configure || die "sed QMAKE_*FLAGS_{RELEASE,DEBUG} failed"
# Respect CC, CXX, LINK and *FLAGS in config.tests
find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \
'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
|| die "sed config.tests failed"
# Bug 172219
sed -e 's:/X11R6/:/:' -i mkspecs/$(qt4_get_mkspec)/qmake.conf || die
if [[ ${CHOST} == *-darwin* ]]; then
# Set FLAGS and remove -arch, since our gcc-apple is multilib crippled (by design)
sed -i \
-e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=-headerpad_max_install_names ${LDFLAGS}:" \
-e "s:-arch\s\w*::g" \
mkspecs/common/g++-macx.conf \
|| die "sed g++-macx.conf failed"
# Fix configure's -arch settings that appear in qmake/Makefile and also
# fix arch handling (automagically duplicates our -arch arg and breaks
# pch). Additionally disable Xarch support.
sed -i \
-e "s:-arch i386::" \
-e "s:-arch ppc::" \
-e "s:-arch x86_64::" \
-e "s:-arch ppc64::" \
-e "s:-arch \$i::" \
-e "/if \[ ! -z \"\$NATIVE_64_ARCH\" \]; then/,/fi/ d" \
-e "s:CFG_MAC_XARCH=yes:CFG_MAC_XARCH=no:g" \
-e "s:-Xarch_x86_64::g" \
-e "s:-Xarch_ppc64::g" \
configure mkspecs/common/gcc-base-macx.conf mkspecs/common/g++-macx.conf \
|| die "sed -arch/-Xarch failed"
# On Snow Leopard don't fall back to 10.5 deployment target.
if [[ ${CHOST} == *-apple-darwin10 ]]; then
sed -i \
-e "s:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET.*:QMakeVar set QMAKE_MACOSX_DEPLOYMENT_TARGET 10.6:g" \
-e "s:-mmacosx-version-min=10.[0-9]:-mmacosx-version-min=10.6:g" \
configure mkspecs/common/g++-macx.conf \
|| die "sed deployment target failed"
fi
fi
# this is needed for all systems with a separate -liconv, except
# Darwin, for which the sources already cater for -liconv
if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
sed -e 's|mac:\(LIBS += -liconv\)|\1|g' \
-i config.tests/unix/iconv/iconv.pro \
|| die "sed iconv.pro failed"
fi
# we need some patches for Solaris
sed -i -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
mkspecs/$(qt4_get_mkspec)/qmake.conf || die
# use GCC over SunStudio
sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
# do not flirt with non-Prefix stuff, we're quite possessive
sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
mkspecs/$(qt4_get_mkspec)/qmake.conf || die
# apply patches
[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
epatch_user
}
qt4_multilib_src_configure() {
qt4_prepare_env
qt4_symlink_tools_to_build_dir
# toolchain setup
tc-export CC CXX OBJCOPY STRIP
export AR="$(tc-getAR) cqs"
export LD="$(tc-getCXX)"
# convert tc-arch to the values supported by Qt
local arch=
case $(tc-arch) in
amd64|x64-*) arch=x86_64 ;;
ppc*-macos) arch=ppc ;;
ppc*) arch=powerpc ;;
sparc*) arch=sparc ;;
x86-macos) arch=x86 ;;
x86*) arch=i386 ;;
alpha|arm|ia64|mips|s390) arch=$(tc-arch) ;;
hppa|sh) arch=generic ;;
*) die "qt4-build-multilib.eclass: unsupported tc-arch '$(tc-arch)'" ;;
esac
# configure arguments
local conf=(
# installation paths
-prefix "${QT4_PREFIX}"
-bindir "${QT4_BINDIR}"
-libdir "${QT4_LIBDIR}"
-docdir "${QT4_DOCDIR}"
-headerdir "${QT4_HEADERDIR}"
-plugindir "${QT4_PLUGINDIR}"
-importdir "${QT4_IMPORTDIR}"
-datadir "${QT4_DATADIR}"
-translationdir "${QT4_TRANSLATIONDIR}"
-sysconfdir "${QT4_SYSCONFDIR}"
-examplesdir "${QT4_EXAMPLESDIR}"
-demosdir "${QT4_DEMOSDIR}"
# debug/release
$(use_if_iuse debug && echo -debug || echo -release)
-no-separate-debug-info
# licensing stuff
-opensource -confirm-license
# build shared libraries
-shared
# skip recursive processing of .pro files at the end of configure
# (we run qmake by ourselves), thus saving quite a bit of time
-dont-process
# always enable large file support
-largefile
# exceptions USE flag
$(in_iuse exceptions && qt_use exceptions || echo -exceptions)
# build STL support
-stl
# architecture/platform (mkspec)
-arch ${arch}
-platform $(qt4_get_mkspec)
# prefer system libraries
-system-zlib
# exclude examples and demos from default build
-nomake examples
-nomake demos
# disable rpath on non-prefix (bugs 380415 and 417169)
$(use prefix || echo -no-rpath)
# verbosity of the configure and build phases
-verbose $(${QT4_VERBOSE_BUILD} || echo -silent)
# precompiled headers don't work on hardened, where the flag is masked
$(in_iuse pch && qt_use pch || echo -no-pch)
# enable linker optimizations to reduce relocations, except on Solaris
# where this flag seems to introduce major breakage to applications,
# mostly to be seen as a core dump with the message:
# "QPixmap: Must construct a QApplication before a QPaintDevice"
$([[ ${CHOST} != *-solaris* ]] && echo -reduce-relocations)
# this one is needed for all systems with a separate -liconv, apart from
# Darwin, for which the sources already cater for -liconv
$(use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && echo -liconv)
)
if use_if_iuse aqua; then
if [[ ${CHOST##*-darwin} -ge 9 ]]; then
conf+=(
# on (snow) leopard use the new (frameworked) cocoa code
-cocoa -framework
# add hint for the framework location
-F"${QT4_LIBDIR}"
)
else
conf+=(-no-framework)
fi
fi
conf+=(
# module-specific options
"${myconf[@]}"
)
einfo "Configuring with: ${conf[@]}"
"${S}"/configure "${conf[@]}" || die "configure failed"
# configure is stupid and assigns QMAKE_LFLAGS twice,
# thus the previous -rpath-link flag gets overwritten
# and some packages (e.g. qthelp) fail to link
sed -i -e '/^QMAKE_LFLAGS =/ s:$: $$QMAKE_LFLAGS:' \
.qmake.cache || die "sed .qmake.cache failed"
qt4_qmake
qt4_foreach_target_subdir qt4_qmake
}
qt4_multilib_src_compile() {
qt4_prepare_env
qt4_foreach_target_subdir emake
}
qt4_multilib_src_test() {
qt4_prepare_env
qt4_foreach_target_subdir emake -j1 check
}
qt4_multilib_src_install() {
qt4_prepare_env
qt4_foreach_target_subdir emake INSTALL_ROOT="${D}" install
if [[ ${PN} == qtcore ]]; then
set -- emake INSTALL_ROOT="${D}" install_{mkspecs,qmake}
einfo "Running $*"
"$@"
# install env.d file
cat > "${T}/44qt4-${CHOST}" <<-_EOF_
LDPATH="${QT4_LIBDIR}"
_EOF_
doenvd "${T}/44qt4-${CHOST}"
# install qtchooser configuration file
cat > "${T}/qt4-${CHOST}.conf" <<-_EOF_
${QT4_BINDIR}
${QT4_LIBDIR}
_EOF_
(
insinto /etc/xdg/qtchooser
doins "${T}/qt4-${CHOST}.conf"
)
if multilib_is_native_abi; then
# convenience symlinks
dosym qt4-"${CHOST}".conf /etc/xdg/qtchooser/4.conf
dosym qt4-"${CHOST}".conf /etc/xdg/qtchooser/qt4.conf
# TODO bug 522646: write an eselect module to manage default.conf
dosym qt4.conf /etc/xdg/qtchooser/default.conf
fi
fi
install_qconfigs
fix_library_files
fix_includes
}
qt4_multilib_src_install_all() {
if [[ ${PN} == qtcore ]]; then
# include gentoo-qconfig.h at the beginning of Qt{,Core}/qconfig.h
if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
sed -i -e '1i #include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
"${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \
|| die "sed failed (qconfig.h)"
dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo \
"${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
else
sed -i -e '1i #include <Gentoo/gentoo-qconfig.h>\n' \
"${D}${QT4_HEADERDIR}"/Qt{,Core}/qconfig.h \
|| die "sed failed (qconfig.h)"
fi
dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
fi
# install private headers of a few modules
if has ${PN} qtcore qtdeclarative qtgui qtscript; then
local moduledir=${PN#qt}
local modulename=Qt$(tr 'a-z' 'A-Z' <<< ${moduledir:0:1})${moduledir:1}
[[ ${moduledir} == core ]] && moduledir=corelib
einfo "Installing private headers into ${QT4_HEADERDIR}/${modulename}/private"
insinto "${QT4_HEADERDIR#${EPREFIX}}"/${modulename}/private
find "${S}"/src/${moduledir} -type f -name '*_p.h' -exec doins '{}' + || die
fi
# remove .la files since we are building only shared libraries
prune_libtool_files
}
# @FUNCTION: qt4-build-multilib_pkg_postinst
# @DESCRIPTION:
# Regenerate configuration, plus throw a message about possible
# breakages and proposed solutions.
qt4-build-multilib_pkg_postinst() {
generate_qconfigs
}
# @FUNCTION: qt4-build-multilib_pkg_postrm
# @DESCRIPTION:
# Regenerate configuration when the package is completely removed.
qt4-build-multilib_pkg_postrm() {
generate_qconfigs
}
# @FUNCTION: qt_use
# @USAGE: <flag> [feature] [enableval]
# @DESCRIPTION:
# Outputs "-${enableval}-${feature}" if <flag> is enabled, "-no-${feature}"
# otherwise. If [feature] is not specified, <flag> is used in its place.
# If [enableval] is not specified, the "-${enableval}" prefix is omitted.
qt_use() {
use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
}
# @FUNCTION: qt_native_use
# @USAGE: <flag> [feature] [enableval]
# @DESCRIPTION:
# Outputs "-${enableval}-${feature}" if <flag> is enabled and we are currently
# building for the native ABI, "-no-${feature}" otherwise. If [feature] is not
# specified, <flag> is used in its place. If [enableval] is not specified,
# the "-${enableval}" prefix is omitted.
qt_native_use() {
multilib_is_native_abi && use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
}
###### Internal functions ######
# @FUNCTION: qt4_prepare_env
# @INTERNAL
# @DESCRIPTION:
# Prepares the environment for building Qt.
qt4_prepare_env() {
# setup installation directories
QT4_PREFIX=${EPREFIX}/usr
QT4_HEADERDIR=${QT4_PREFIX}/include/qt4
QT4_LIBDIR=${QT4_PREFIX}/$(get_libdir)/qt4
QT4_PCDIR=${QT4_PREFIX}/$(get_libdir)/pkgconfig
QT4_BINDIR=${QT4_LIBDIR}/bin
QT4_PLUGINDIR=${QT4_LIBDIR}/plugins
QT4_IMPORTDIR=${QT4_LIBDIR}/imports
QT4_DATADIR=${QT4_PREFIX}/share/qt4
QT4_DOCDIR=${QT4_PREFIX}/share/doc/qt-${PV}
QT4_TRANSLATIONDIR=${QT4_DATADIR}/translations
QT4_EXAMPLESDIR=${QT4_DATADIR}/examples
QT4_DEMOSDIR=${QT4_DATADIR}/demos
QT4_SYSCONFDIR=${EPREFIX}/etc/qt4
QMAKE_LIBDIR_QT=${QT4_LIBDIR}
export XDG_CONFIG_HOME="${T}"
}
# @FUNCTION: qt4_foreach_target_subdir
# @INTERNAL
# @DESCRIPTION:
# Executes the given command inside each directory listed in QT4_TARGET_DIRECTORIES.
qt4_foreach_target_subdir() {
local subdir
for subdir in ${QT4_TARGET_DIRECTORIES}; do
mkdir -p "${subdir}" || die
pushd "${subdir}" >/dev/null || die
einfo "Running $* ${subdir:+in ${subdir}}"
"$@"
popd >/dev/null || die
done
}
# @FUNCTION: qt4_symlink_tools_to_build_dir
# @INTERNAL
# @DESCRIPTION:
# Symlinks qtcore tools to BUILD_DIR,
# so that they can be used when building other modules.
qt4_symlink_tools_to_build_dir() {
local tool= tools=()
if [[ ${PN} != qtcore ]]; then
tools+=(qmake moc rcc uic)
fi
mkdir -p "${BUILD_DIR}"/bin || die
pushd "${BUILD_DIR}"/bin >/dev/null || die
for tool in "${tools[@]}"; do
[[ -e ${QT4_BINDIR}/${tool} ]] || continue
ln -s "${QT4_BINDIR}/${tool}" . || die "failed to symlink ${tool}"
done
popd >/dev/null || die
}
# @FUNCTION: qt4_qmake
# @INTERNAL
# @DESCRIPTION:
# Helper function that runs qmake in the current target subdir.
# Intended to be called by qt4_foreach_target_subdir().
qt4_qmake() {
local projectdir=${PWD/#${BUILD_DIR}/${S}}
"${BUILD_DIR}"/bin/qmake \
CONFIG+=nostrip \
LIBS+=-L"${QT4_LIBDIR}" \
"${projectdir}" \
|| die "qmake failed (${projectdir})"
}
# @FUNCTION: install_qconfigs
# @INTERNAL
# @DESCRIPTION:
# Install gentoo-specific mkspecs configurations.
install_qconfigs() {
local x
if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
for x in QCONFIG_ADD QCONFIG_REMOVE; do
[[ -n ${!x} ]] && echo ${x}=${!x} >> "${BUILD_DIR}"/${PN}-qconfig.pri
done
insinto ${QT4_DATADIR#${EPREFIX}}/mkspecs/gentoo
doins "${BUILD_DIR}"/${PN}-qconfig.pri
fi
if [[ -n ${QCONFIG_DEFINE} ]]; then
for x in ${QCONFIG_DEFINE}; do
echo "#define ${x}" >> "${BUILD_DIR}"/gentoo-${PN}-qconfig.h
done
insinto ${QT4_HEADERDIR#${EPREFIX}}/Gentoo
doins "${BUILD_DIR}"/gentoo-${PN}-qconfig.h
fi
}
# @FUNCTION: generate_qconfigs
# @INTERNAL
# @DESCRIPTION:
# Generates gentoo-specific qconfig.{h,pri}.
generate_qconfigs() {
if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${PN} == qtcore ]]; then
local x qconfig_add qconfig_remove qconfig_new
for x in "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
[[ -f ${x} ]] || continue
qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")"
qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
done
# these error checks do not use die because dying in pkg_post{inst,rm}
# just makes things worse.
if [[ -e "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then
# start with the qconfig.pri that qtcore installed
if ! cp "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/qconfig.pri \
"${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri; then
eerror "cp qconfig failed."
return 1
fi
# generate list of QT_CONFIG entries from the existing list
# including qconfig_add and excluding qconfig_remove
for x in $(sed -n 's/^QT_CONFIG +=//p' \
"${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri) ${qconfig_add}; do
has ${x} ${qconfig_remove} || qconfig_new+=" ${x}"
done
# replace the existing QT_CONFIG list with qconfig_new
if ! sed -i -e "s/QT_CONFIG +=.*/QT_CONFIG += ${qconfig_new}/" \
"${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri; then
eerror "Sed for QT_CONFIG failed"
return 1
fi
# create Gentoo/qconfig.h
if [[ ! -e ${ROOT}${QT4_HEADERDIR}/Gentoo ]]; then
if ! mkdir -p "${ROOT}${QT4_HEADERDIR}"/Gentoo; then
eerror "mkdir ${QT4_HEADERDIR}/Gentoo failed"
return 1
fi
fi
: > "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-qconfig.h
for x in "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-*-qconfig.h; do
[[ -f ${x} ]] || continue
cat "${x}" >> "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-qconfig.h
done
else
rm -f "${ROOT}${QT4_DATADIR}"/mkspecs/qconfig.pri
rm -f "${ROOT}${QT4_HEADERDIR}"/Gentoo/gentoo-qconfig.h
rmdir "${ROOT}${QT4_DATADIR}"/mkspecs \
"${ROOT}${QT4_DATADIR}" \
"${ROOT}${QT4_HEADERDIR}"/Gentoo \
"${ROOT}${QT4_HEADERDIR}" 2>/dev/null
fi
fi
}
# @FUNCTION: fix_library_files
# @INTERNAL
# @DESCRIPTION:
# Fixes the paths in *.prl and *.pc, as they are wrong due to sandbox, and
# moves the *.pc files into the pkgconfig directory.
fix_library_files() {
local libfile
for libfile in "${D}"/${QT4_LIBDIR}/{*.prl,pkgconfig/*.pc}; do
if [[ -e ${libfile} ]]; then
sed -i -e "s:${S}/lib:${QT4_LIBDIR}:g" ${libfile} || die "sed on ${libfile} failed"
fi
done
# pkgconfig files refer to WORKDIR/bin as the moc and uic locations
for libfile in "${D}"/${QT4_LIBDIR}/pkgconfig/*.pc; do
if [[ -e ${libfile} ]]; then
sed -i -e "s:${S}/bin:${QT4_BINDIR}:g" ${libfile} || die "sed on ${libfile} failed"
# Move .pc files into the pkgconfig directory
dodir ${QT4_PCDIR#${EPREFIX}}
mv ${libfile} "${D}"/${QT4_PCDIR}/ || die "moving ${libfile} to ${D}/${QT4_PCDIR}/ failed"
fi
done
# Don't install an empty directory
rmdir "${D}"/${QT4_LIBDIR}/pkgconfig
}
# @FUNCTION: fix_includes
# @DESCRIPTION:
# For MacOS X we need to add some symlinks when frameworks are
# being used, to avoid complications with some more or less stupid packages.
fix_includes() {
if use_if_iuse aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
local frw dest f h rdir
# Some packages tend to include <Qt/...>
dodir "${QT4_HEADERDIR#${EPREFIX}}"/Qt
# Fake normal headers when frameworks are installed... eases life later
# on, make sure we use relative links though, as some ebuilds assume
# these dirs exist in src_install to add additional files
f=${QT4_HEADERDIR}
h=${QT4_LIBDIR}
while [[ -n ${f} && ${f%%/*} == ${h%%/*} ]] ; do
f=${f#*/}
h=${h#*/}
done
rdir=${h}
f="../"
while [[ ${h} == */* ]] ; do
f="${f}../"
h=${h#*/}
done
rdir="${f}${rdir}"
for frw in "${D}${QT4_LIBDIR}"/*.framework; do
[[ -e "${frw}"/Headers ]] || continue
f=$(basename ${frw})
dest="${QT4_HEADERDIR#${EPREFIX}}"/${f%.framework}
dosym "${rdir}"/${f}/Headers "${dest}"
# Link normal headers as well.
for hdr in "${D}/${QT4_LIBDIR}/${f}"/Headers/*; do
h=$(basename ${hdr})
dosym "../${rdir}"/${f}/Headers/${h} \
"${QT4_HEADERDIR#${EPREFIX}}"/Qt/${h}
done
done
fi
}
# @FUNCTION: qt4_get_mkspec
# @INTERNAL
# @DESCRIPTION:
# Returns the right mkspec for the current CHOST/CXX combination.
qt4_get_mkspec() {
local spec=
case ${CHOST} in
*-linux*)
spec=linux ;;
*-darwin*)
use_if_iuse aqua &&
spec=macx || # mac with carbon/cocoa
spec=darwin ;; # darwin/mac with X11
*-freebsd*|*-dragonfly*)
spec=freebsd ;;
*-netbsd*)
spec=netbsd ;;
*-openbsd*)
spec=openbsd ;;
*-aix*)
spec=aix ;;
hppa*-hpux*)
spec=hpux ;;
ia64*-hpux*)
spec=hpuxi ;;
*-solaris*)
spec=solaris ;;
*)
die "qt4-build-multilib.eclass: unsupported CHOST '${CHOST}'" ;;
esac
case $(tc-getCXX) in
*g++*)
spec+=-g++ ;;
*clang*)
if [[ -d ${S}/mkspecs/unsupported/${spec}-clang ]]; then
spec=unsupported/${spec}-clang
else
ewarn "${spec}-clang mkspec does not exist, falling back to ${spec}-g++"
spec+=-g++
fi ;;
*icpc*)
if [[ -d ${S}/mkspecs/${spec}-icc ]]; then
spec+=-icc
else
ewarn "${spec}-icc mkspec does not exist, falling back to ${spec}-g++"
spec+=-g++
fi ;;
*)
die "qt4-build-multilib.eclass: unsupported compiler '$(tc-getCXX)'" ;;
esac
# Add -64 for 64-bit prefix profiles
if use amd64-linux || use ia64-linux || use ppc64-linux ||
use x64-macos ||
use sparc64-freebsd || use x64-freebsd || use x64-openbsd ||
use ia64-hpux ||
use sparc64-solaris || use x64-solaris
then
[[ -d ${S}/mkspecs/${spec}-64 ]] && spec+=-64
fi
echo ${spec}
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
@ 2014-11-17 0:24 Davide Pesavento (pesa)
0 siblings, 0 replies; 19+ messages in thread
From: Davide Pesavento (pesa) @ 2014-11-17 0:24 UTC (permalink / raw
To: gentoo-commits
pesa 14/11/17 00:24:43
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Add blocker on emul-linux-x86-qtlibs wrt bug 529370.
Revision Changes Path
1.1424 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1424&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1424&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1423&r2=1.1424
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1423
retrieving revision 1.1424
diff -u -r1.1423 -r1.1424
--- ChangeLog 16 Nov 2014 20:22:40 -0000 1.1423
+++ ChangeLog 17 Nov 2014 00:24:43 -0000 1.1424
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1423 2014/11/16 20:22:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1424 2014/11/17 00:24:43 pesa Exp $
+
+ 17 Nov 2014; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
+ Add blocker on emul-linux-x86-qtlibs wrt bug 529370.
16 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org> perl-module.eclass:
Make calling perlinfo trigger a real warning
1.2 eclass/qt4-build-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.1&r2=1.2
Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt4-build-multilib.eclass 13 Nov 2014 01:45:07 -0000 1.1
+++ qt4-build-multilib.eclass 17 Nov 2014 00:24:43 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.1 2014/11/13 01:45:07 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.2 2014/11/17 00:24:43 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -52,6 +52,7 @@
"
RDEPEND="
dev-qt/qtchooser
+ abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
"
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
@ 2014-12-18 14:35 Davide Pesavento (pesa)
0 siblings, 0 replies; 19+ messages in thread
From: Davide Pesavento (pesa) @ 2014-12-18 14:35 UTC (permalink / raw
To: gentoo-commits
pesa 14/12/18 14:35:03
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Fix breakage caused by recent multilib-build.eclass changes (bug 532510).
Revision Changes Path
1.1467 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1467&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1467&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1466&r2=1.1467
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1466
retrieving revision 1.1467
diff -u -r1.1466 -r1.1467
--- ChangeLog 17 Dec 2014 16:40:53 -0000 1.1466
+++ ChangeLog 18 Dec 2014 14:35:03 -0000 1.1467
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1466 2014/12/17 16:40:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1467 2014/12/18 14:35:03 pesa Exp $
+
+ 18 Dec 2014; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
+ Fix breakage caused by recent multilib-build.eclass changes (bug 532510).
+ Patch by zorry, based on a previous patch by Greg Turner. Thanks also to
+ floppym and mgorny for the initial investigation and suggestions.
17 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org> perl-module.eclass:
Remove code paths that are not called anymore
1.3 eclass/qt4-build-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.2&r2=1.3
Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt4-build-multilib.eclass 17 Nov 2014 00:24:43 -0000 1.2
+++ qt4-build-multilib.eclass 18 Dec 2014 14:35:03 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.2 2014/11/17 00:24:43 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.3 2014/12/18 14:35:03 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -272,10 +272,14 @@
qt4_symlink_tools_to_build_dir
- # toolchain setup
- tc-export CC CXX OBJCOPY STRIP
- export AR="$(tc-getAR) cqs"
- export LD="$(tc-getCXX)"
+ # toolchain setup ('local -x' because of bug 532510)
+ local -x \
+ AR="$(tc-getAR) cqs" \
+ CC=$(tc-getCC) \
+ CXX=$(tc-getCXX) \
+ LD=$(tc-getCXX) \
+ OBJCOPY=$(tc-getOBJCOPY) \
+ STRIP=$(tc-getSTRIP)
# convert tc-arch to the values supported by Qt
local arch=
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
@ 2015-04-22 20:23 Davide Pesavento (pesa)
0 siblings, 0 replies; 19+ messages in thread
From: Davide Pesavento (pesa) @ 2015-04-22 20:23 UTC (permalink / raw
To: gentoo-commits
pesa 15/04/22 20:23:47
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Sync with qt overlay: cleanup prefix-related patching and fix bug #542780.
Revision Changes Path
1.1592 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1592&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1592&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1591&r2=1.1592
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1591
retrieving revision 1.1592
diff -u -r1.1591 -r1.1592
--- ChangeLog 21 Apr 2015 11:19:10 -0000 1.1591
+++ ChangeLog 22 Apr 2015 20:23:47 -0000 1.1592
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1591 2015/04/21 11:19:10 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1592 2015/04/22 20:23:47 pesa Exp $
+
+ 22 Apr 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
+ Sync with qt overlay: cleanup prefix-related patching and fix bug #542780.
21 Apr 2015; Jason Zaman <perfinion@gentoo.org> selinux-policy-2.eclass:
update git urls and migrate git-2 -> git-r3
1.10 eclass/qt4-build-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.9&r2=1.10
Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qt4-build-multilib.eclass 1 Apr 2015 18:45:04 -0000 1.9
+++ qt4-build-multilib.eclass 22 Apr 2015 20:23:47 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.9 2015/04/01 18:45:04 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.10 2015/04/22 20:23:47 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -198,7 +198,7 @@
configure || die "sed SYSTEM_VARIABLES failed"
# Reset QMAKE_*FLAGS_{RELEASE,DEBUG} variables,
- # or they will override user's flags (.qmake.cache)
+ # or they will override the user's flags (via .qmake.cache)
sed -i -e '/^SYSTEM_VARIABLES=/ i \
QMakeVar set QMAKE_CFLAGS_RELEASE\
QMakeVar set QMAKE_CFLAGS_DEBUG\
@@ -215,8 +215,12 @@
'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
|| die "sed config.tests failed"
- # Bug 172219
- sed -e 's:/X11R6/:/:' -i mkspecs/$(qt4_get_mkspec)/qmake.conf || die
+ # Delete references to the obsolete /usr/X11R6 directory
+ # On prefix, this also prevents looking at non-prefix stuff
+ sed -i -re '/^QMAKE_(LIB|INC)DIR(_X11|_OPENGL|)\s+/ s/=.*/=/' \
+ mkspecs/common/linux.conf \
+ mkspecs/$(qt4_get_mkspec)/qmake.conf \
+ || die "sed QMAKE_(LIB|INC)DIR failed"
if [[ ${CHOST} == *-darwin* ]]; then
# Set FLAGS and remove -arch, since our gcc-apple is multilib crippled (by design)
@@ -254,22 +258,10 @@
fi
fi
- # this is needed for all systems with a separate -liconv, except
- # Darwin, for which the sources already cater for -liconv
- if use !elibc_glibc && [[ ${CHOST} != *-darwin* ]]; then
- sed -e 's|mac:\(LIBS += -liconv\)|\1|g' \
- -i config.tests/unix/iconv/iconv.pro \
- || die "sed iconv.pro failed"
- fi
-
- # we need some patches for Solaris
- sed -i -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
- mkspecs/$(qt4_get_mkspec)/qmake.conf || die
- # use GCC over SunStudio
- sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
- # do not flirt with non-Prefix stuff, we're quite possessive
- sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
- mkspecs/$(qt4_get_mkspec)/qmake.conf || die
+ if [[ ${CHOST} == *-solaris* ]]; then
+ sed -i -e '/^QMAKE_LFLAGS_THREAD/a QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,' \
+ mkspecs/$(qt4_get_mkspec)/qmake.conf || die
+ fi
# apply patches
[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
@ 2015-05-09 18:19 Davide Pesavento (pesa)
0 siblings, 0 replies; 19+ messages in thread
From: Davide Pesavento (pesa) @ 2015-05-09 18:19 UTC (permalink / raw
To: gentoo-commits
pesa 15/05/09 18:19:31
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Update from qt overlay: overhaul toolchain and *FLAGS handling for proper multilib support during the configure phase. Fixes bug #545106.
Revision Changes Path
1.1607 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1607&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1607&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1606&r2=1.1607
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1606
retrieving revision 1.1607
diff -u -r1.1606 -r1.1607
--- ChangeLog 9 May 2015 15:33:21 -0000 1.1606
+++ ChangeLog 9 May 2015 18:19:31 -0000 1.1607
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1606 2015/05/09 15:33:21 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1607 2015/05/09 18:19:31 pesa Exp $
+
+ 09 May 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
+ Update from qt overlay: overhaul toolchain and *FLAGS handling for proper
+ multilib support during the configure phase. Fixes bug #545106.
09 May 2015; Manuel Rüger <mrueg@gentoo.org> kde5.eclass:
Sync with overlay.
1.11 eclass/qt4-build-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.10&r2=1.11
Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qt4-build-multilib.eclass 22 Apr 2015 20:23:47 -0000 1.10
+++ qt4-build-multilib.eclass 9 May 2015 18:19:31 -0000 1.11
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.10 2015/04/22 20:23:47 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.11 2015/05/09 18:19:31 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -208,12 +208,16 @@
QMakeVar set QMAKE_LFLAGS_DEBUG\n' \
configure || die "sed QMAKE_*FLAGS_{RELEASE,DEBUG} failed"
- # Respect CC, CXX, LINK and *FLAGS in config.tests
+ # Drop -nocache from qmake invocation in all configure tests, to ensure that the
+ # correct toolchain and build flags are picked up from config.tests/.qmake.cache
find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
- sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \
- 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \
- 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \
- || die "sed config.tests failed"
+ sed -i -e '/bin\/qmake/s/ -nocache//' || die "sed -nocache failed"
+
+ # compile.test needs additional patching so that it doesn't create another cache file
+ # inside the test subdir, which would incorrectly override config.tests/.qmake.cache
+ sed -i -e '/echo.*QT_BUILD_TREE.*\.qmake\.cache/d' \
+ -e '/bin\/qmake/s/ "$SRCDIR/ "QT_BUILD_TREE=$OUTDIR"&/' \
+ config.tests/unix/compile.test || die "sed compile.test failed"
# Delete references to the obsolete /usr/X11R6 directory
# On prefix, this also prevents looking at non-prefix stuff
@@ -339,6 +343,18 @@
-arch ${arch}
-platform $(qt4_get_mkspec)
+ # instruction set support
+ $(is-flagq -mno-mmx && echo -no-mmx)
+ $(is-flagq -mno-3dnow && echo -no-3dnow)
+ $(is-flagq -mno-sse && echo -no-sse)
+ $(is-flagq -mno-sse2 && echo -no-sse2)
+ $(is-flagq -mno-sse3 && echo -no-sse3)
+ $(is-flagq -mno-ssse3 && echo -no-ssse3)
+ $(is-flagq -mno-sse4.1 && echo -no-sse4.1)
+ $(is-flagq -mno-sse4.2 && echo -no-sse4.2)
+ $(is-flagq -mno-avx && echo -no-avx)
+ $(is-flagq -mfpu=* && ! is-flagq -mfpu=*neon* && echo -no-neon)
+
# prefer system libraries
-system-zlib
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
@ 2015-05-09 19:48 Davide Pesavento (pesa)
0 siblings, 0 replies; 19+ messages in thread
From: Davide Pesavento (pesa) @ 2015-05-09 19:48 UTC (permalink / raw
To: gentoo-commits
pesa 15/05/09 19:48:37
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Move workaround for bug 367045 from qtgui ebuild to eclass.
Revision Changes Path
1.1608 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1608&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1608&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1607&r2=1.1608
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1607
retrieving revision 1.1608
diff -u -r1.1607 -r1.1608
--- ChangeLog 9 May 2015 18:19:31 -0000 1.1607
+++ ChangeLog 9 May 2015 19:48:37 -0000 1.1608
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1607 2015/05/09 18:19:31 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1608 2015/05/09 19:48:37 pesa Exp $
+
+ 09 May 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
+ Move workaround for bug 367045 from qtgui ebuild to eclass.
09 May 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
Update from qt overlay: overhaul toolchain and *FLAGS handling for proper
1.12 eclass/qt4-build-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.11&r2=1.12
Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qt4-build-multilib.eclass 9 May 2015 18:19:31 -0000 1.11
+++ qt4-build-multilib.eclass 9 May 2015 19:48:37 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.11 2015/05/09 18:19:31 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.12 2015/05/09 19:48:37 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -355,6 +355,9 @@
$(is-flagq -mno-avx && echo -no-avx)
$(is-flagq -mfpu=* && ! is-flagq -mfpu=*neon* && echo -no-neon)
+ # bug 367045
+ $([[ ${CHOST} == *86*-apple-darwin* ]] && echo -no-ssse3)
+
# prefer system libraries
-system-zlib
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
@ 2015-05-09 19:51 Davide Pesavento (pesa)
0 siblings, 0 replies; 19+ messages in thread
From: Davide Pesavento (pesa) @ 2015-05-09 19:51 UTC (permalink / raw
To: gentoo-commits
pesa 15/05/09 19:51:00
Modified: ChangeLog qt4-build-multilib.eclass
Log:
graphite support was dropped from gcc-4.7
Revision Changes Path
1.1609 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1609&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1609&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1608&r2=1.1609
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1608
retrieving revision 1.1609
diff -u -r1.1608 -r1.1609
--- ChangeLog 9 May 2015 19:48:37 -0000 1.1608
+++ ChangeLog 9 May 2015 19:51:00 -0000 1.1609
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1608 2015/05/09 19:48:37 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1609 2015/05/09 19:51:00 pesa Exp $
+
+ 09 May 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
+ graphite support was dropped from gcc-4.7
09 May 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
Move workaround for bug 367045 from qtgui ebuild to eclass.
1.13 eclass/qt4-build-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.12&r2=1.13
Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qt4-build-multilib.eclass 9 May 2015 19:48:37 -0000 1.12
+++ qt4-build-multilib.eclass 9 May 2015 19:51:00 -0000 1.13
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.12 2015/05/09 19:48:37 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.13 2015/05/09 19:51:00 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -187,12 +187,6 @@
append-flags -mminimal-toc
fi
- # Bug 417105
- # graphite on gcc 4.7 causes miscompilations
- if [[ $(gcc-version) == "4.7" ]]; then
- filter-flags -fgraphite-identity
- fi
-
# Read also AR from the environment
sed -i -e 's/^SYSTEM_VARIABLES="/&AR /' \
configure || die "sed SYSTEM_VARIABLES failed"
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
@ 2015-05-10 1:06 Davide Pesavento (pesa)
0 siblings, 0 replies; 19+ messages in thread
From: Davide Pesavento (pesa) @ 2015-05-10 1:06 UTC (permalink / raw
To: gentoo-commits
pesa 15/05/10 01:06:49
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Delete obsolete code that is now causing problems on freebsd (bug 493310).
Revision Changes Path
1.1611 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1611&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1611&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1610&r2=1.1611
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1610
retrieving revision 1.1611
diff -u -r1.1610 -r1.1611
--- ChangeLog 9 May 2015 22:20:44 -0000 1.1610
+++ ChangeLog 10 May 2015 01:06:49 -0000 1.1611
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1610 2015/05/09 22:20:44 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1611 2015/05/10 01:06:49 pesa Exp $
+
+ 10 May 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
+ Delete obsolete code that is now causing problems on freebsd (bug 493310).
09 May 2015; James Le Cuirot <chewi@gentoo.org> java-utils-2.eclass,
java-virtuals-2.eclass, java-vm-2.eclass:
1.14 eclass/qt4-build-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.13&r2=1.14
Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- qt4-build-multilib.eclass 9 May 2015 19:51:00 -0000 1.13
+++ qt4-build-multilib.eclass 10 May 2015 01:06:49 -0000 1.14
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.13 2015/05/09 19:51:00 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.14 2015/05/10 01:06:49 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -373,10 +373,6 @@
# mostly to be seen as a core dump with the message:
# "QPixmap: Must construct a QApplication before a QPaintDevice"
$([[ ${CHOST} != *-solaris* ]] && echo -reduce-relocations)
-
- # this one is needed for all systems with a separate -liconv, apart from
- # Darwin, for which the sources already cater for -liconv
- $(use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && echo -liconv)
)
if use_if_iuse aqua; then
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
@ 2015-05-31 13:56 Davide Pesavento (pesa)
0 siblings, 0 replies; 19+ messages in thread
From: Davide Pesavento (pesa) @ 2015-05-31 13:56 UTC (permalink / raw
To: gentoo-commits
pesa 15/05/31 13:56:53
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Blacklist graphite-related flags that cause ICEs on qtwebkit (bug 550780).
Revision Changes Path
1.1633 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1633&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1633&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1632&r2=1.1633
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1632
retrieving revision 1.1633
diff -u -r1.1632 -r1.1633
--- ChangeLog 31 May 2015 10:11:35 -0000 1.1632
+++ ChangeLog 31 May 2015 13:56:53 -0000 1.1633
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1632 2015/05/31 10:11:35 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1633 2015/05/31 13:56:53 pesa Exp $
+
+ 31 May 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
+ Blacklist graphite-related flags that cause ICEs on qtwebkit (bug 550780).
31 May 2015; Jason Zaman <perfinion@gentoo.org> kde4-base.eclass, kde5.eclass:
KDE: fix SELinux deps, bug 550824
1.16 eclass/qt4-build-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.15&r2=1.16
Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qt4-build-multilib.eclass 10 May 2015 14:27:29 -0000 1.15
+++ qt4-build-multilib.eclass 31 May 2015 13:56:53 -0000 1.16
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.15 2015/05/10 14:27:29 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.16 2015/05/31 13:56:53 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -154,20 +154,6 @@
|| die "sed failed (skip X11 tests)"
fi
- if use_if_iuse aqua; then
- sed -i \
- -e '/^CONFIG/s:app_bundle::' \
- -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
- mkspecs/$(qt4_get_mkspec)/qmake.conf \
- || die "sed failed (aqua)"
-
- # we are crazy and build cocoa + qt3support
- if { ! in_iuse qt3support || use qt3support; } && [[ ${CHOST##*-darwin} -ge 9 ]]; then
- sed -i -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
- configure || die "sed failed (cocoa + qt3support)"
- fi
- fi
-
if [[ ${PN} == qtcore ]]; then
# Bug 373061
# qmake bus errors with -O2 or -O3 but -O1 works
@@ -182,6 +168,11 @@
fi
fi
+ if [[ ${PN} == qtwebkit ]]; then
+ # Bug 550780
+ filter-flags -fgraphite-identity -floop-strip-mine
+ fi
+
# Bug 261632
if use ppc64; then
append-flags -mminimal-toc
@@ -220,6 +211,20 @@
mkspecs/$(qt4_get_mkspec)/qmake.conf \
|| die "sed QMAKE_(LIB|INC)DIR failed"
+ if use_if_iuse aqua; then
+ sed -i \
+ -e '/^CONFIG/s:app_bundle::' \
+ -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname absolute_library_soname:' \
+ mkspecs/$(qt4_get_mkspec)/qmake.conf \
+ || die "sed failed (aqua)"
+
+ # we are crazy and build cocoa + qt3support
+ if { ! in_iuse qt3support || use qt3support; } && [[ ${CHOST##*-darwin} -ge 9 ]]; then
+ sed -i -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
+ configure || die "sed failed (cocoa + qt3support)"
+ fi
+ fi
+
if [[ ${CHOST} == *-darwin* ]]; then
# Set FLAGS and remove -arch, since our gcc-apple is multilib crippled (by design)
sed -i \
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
@ 2015-06-09 18:13 Davide Pesavento (pesa)
0 siblings, 0 replies; 19+ messages in thread
From: Davide Pesavento (pesa) @ 2015-06-09 18:13 UTC (permalink / raw
To: gentoo-commits
pesa 15/06/09 18:13:42
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Remove two seds that are no longer needed on current Qt versions.
Revision Changes Path
1.1646 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1646&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1646&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1645&r2=1.1646
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1645
retrieving revision 1.1646
diff -u -r1.1645 -r1.1646
--- ChangeLog 9 Jun 2015 10:18:38 -0000 1.1645
+++ ChangeLog 9 Jun 2015 18:13:42 -0000 1.1646
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1645 2015/06/09 10:18:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1646 2015/06/09 18:13:42 pesa Exp $
+
+ 09 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
+ Remove two seds that are no longer needed on current Qt versions.
09 Jun 2015; Gilles Dartiguelongue <eva@gentoo.org> gnome2.eclass,
vala.eclass:
1.17 eclass/qt4-build-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.16&r2=1.17
Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- qt4-build-multilib.eclass 31 May 2015 13:56:53 -0000 1.16
+++ qt4-build-multilib.eclass 9 Jun 2015 18:13:42 -0000 1.17
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.16 2015/05/31 13:56:53 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.17 2015/06/09 18:13:42 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -459,8 +459,15 @@
fi
fi
+ # move pkgconfig files to the correct directory
+ local pcfile
+ for pcfile in "${D}/${QT4_LIBDIR}"/pkgconfig/*.pc; do
+ dodir /usr/$(get_libdir)/pkgconfig
+ mv "${pcfile}" "${ED}"/usr/$(get_libdir)/pkgconfig || die
+ done
+ rmdir "${D}/${QT4_LIBDIR}"/pkgconfig || die
+
install_qconfigs
- fix_library_files
fix_includes
}
@@ -547,7 +554,6 @@
QT4_PREFIX=${EPREFIX}/usr
QT4_HEADERDIR=${QT4_PREFIX}/include/qt4
QT4_LIBDIR=${QT4_PREFIX}/$(get_libdir)/qt4
- QT4_PCDIR=${QT4_PREFIX}/$(get_libdir)/pkgconfig
QT4_BINDIR=${QT4_LIBDIR}/bin
QT4_PLUGINDIR=${QT4_LIBDIR}/plugins
QT4_IMPORTDIR=${QT4_LIBDIR}/imports
@@ -699,34 +705,6 @@
fi
}
-# @FUNCTION: fix_library_files
-# @INTERNAL
-# @DESCRIPTION:
-# Fixes the paths in *.prl and *.pc, as they are wrong due to sandbox, and
-# moves the *.pc files into the pkgconfig directory.
-fix_library_files() {
- local libfile
- for libfile in "${D}"/${QT4_LIBDIR}/{*.prl,pkgconfig/*.pc}; do
- if [[ -e ${libfile} ]]; then
- sed -i -e "s:${S}/lib:${QT4_LIBDIR}:g" ${libfile} || die "sed on ${libfile} failed"
- fi
- done
-
- # pkgconfig files refer to WORKDIR/bin as the moc and uic locations
- for libfile in "${D}"/${QT4_LIBDIR}/pkgconfig/*.pc; do
- if [[ -e ${libfile} ]]; then
- sed -i -e "s:${S}/bin:${QT4_BINDIR}:g" ${libfile} || die "sed on ${libfile} failed"
-
- # Move .pc files into the pkgconfig directory
- dodir ${QT4_PCDIR#${EPREFIX}}
- mv ${libfile} "${D}"/${QT4_PCDIR}/ || die "moving ${libfile} to ${D}/${QT4_PCDIR}/ failed"
- fi
- done
-
- # Don't install an empty directory
- rmdir "${D}"/${QT4_LIBDIR}/pkgconfig
-}
-
# @FUNCTION: fix_includes
# @DESCRIPTION:
# For MacOS X we need to add some symlinks when frameworks are
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
@ 2015-06-09 21:12 Davide Pesavento (pesa)
0 siblings, 0 replies; 19+ messages in thread
From: Davide Pesavento (pesa) @ 2015-06-09 21:12 UTC (permalink / raw
To: gentoo-commits
pesa 15/06/09 21:12:51
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Rename some internal functions for consistency.
Revision Changes Path
1.1649 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1649&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1649&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1648&r2=1.1649
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1648
retrieving revision 1.1649
diff -u -r1.1648 -r1.1649
--- ChangeLog 9 Jun 2015 20:16:59 -0000 1.1648
+++ ChangeLog 9 Jun 2015 21:12:50 -0000 1.1649
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1648 2015/06/09 20:16:59 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1649 2015/06/09 21:12:50 pesa Exp $
+
+ 09 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
+ Rename some internal functions for consistency.
09 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass,
qt5-build.eclass:
1.19 eclass/qt4-build-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.18&r2=1.19
Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qt4-build-multilib.eclass 9 Jun 2015 20:16:59 -0000 1.18
+++ qt4-build-multilib.eclass 9 Jun 2015 21:12:50 -0000 1.19
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.18 2015/06/09 20:16:59 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.19 2015/06/09 21:12:50 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -108,6 +108,9 @@
# @DESCRIPTION:
# List of macros that must be defined in QtCore/qconfig.h
+
+###### Phase functions ######
+
# @FUNCTION: qt4-build-multilib_src_unpack
# @DESCRIPTION:
# Unpacks the sources.
@@ -459,16 +462,18 @@
fi
fi
- # move pkgconfig files to the correct directory
+ # move pkgconfig files to the correct location
+ eshopts_push -s nullglob
local pcfile
for pcfile in "${D}/${QT4_LIBDIR}"/pkgconfig/*.pc; do
dodir /usr/$(get_libdir)/pkgconfig
mv "${pcfile}" "${ED}"/usr/$(get_libdir)/pkgconfig || die
done
+ eshopts_pop
rmdir "${D}/${QT4_LIBDIR}"/pkgconfig || die
- install_qconfigs
- fix_includes
+ qt4_install_module_qconfigs
+ qt4_symlink_framework_headers
}
qt4_multilib_src_install_all() {
@@ -510,16 +515,19 @@
# Regenerate configuration, plus throw a message about possible
# breakages and proposed solutions.
qt4-build-multilib_pkg_postinst() {
- generate_qconfigs
+ qt4_regenerate_global_qconfigs
}
# @FUNCTION: qt4-build-multilib_pkg_postrm
# @DESCRIPTION:
# Regenerate configuration when the package is completely removed.
qt4-build-multilib_pkg_postrm() {
- generate_qconfigs
+ qt4_regenerate_global_qconfigs
}
+
+###### Public helpers ######
+
# @FUNCTION: qt_use
# @USAGE: <flag> [feature] [enableval]
# @DESCRIPTION:
@@ -622,11 +630,11 @@
|| die "qmake failed (${projectdir})"
}
-# @FUNCTION: install_qconfigs
+# @FUNCTION: qt4_install_module_qconfigs
# @INTERNAL
# @DESCRIPTION:
-# Install gentoo-specific mkspecs configurations.
-install_qconfigs() {
+# Creates and installs gentoo-specific ${PN}-qconfig.{h,pri} files.
+qt4_install_module_qconfigs() {
local x
if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
for x in QCONFIG_ADD QCONFIG_REMOVE; do
@@ -645,11 +653,12 @@
fi
}
-# @FUNCTION: generate_qconfigs
+# @FUNCTION: qt4_regenerate_global_qconfigs
# @INTERNAL
# @DESCRIPTION:
-# Generates gentoo-specific qconfig.{h,pri}.
-generate_qconfigs() {
+# Generates Gentoo-specific qconfig.{h,pri} according to the build configuration.
+# Don't call die here because dying in pkg_post{inst,rm} only makes things worse.
+qt4_regenerate_global_qconfigs() {
if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${PN} == qtcore ]]; then
local x qconfig_add qconfig_remove qconfig_new
for x in "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/*-qconfig.pri; do
@@ -658,8 +667,6 @@
qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")"
done
- # these error checks do not use die because dying in pkg_post{inst,rm}
- # just makes things worse.
if [[ -e "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/qconfig.pri ]]; then
# start with the qconfig.pri that qtcore installed
if ! cp "${ROOT}${QT4_DATADIR}"/mkspecs/gentoo/qconfig.pri \
@@ -705,11 +712,11 @@
fi
}
-# @FUNCTION: fix_includes
+# @FUNCTION: qt4_symlink_framework_headers
# @DESCRIPTION:
-# For MacOS X we need to add some symlinks when frameworks are
-# being used, to avoid complications with some more or less stupid packages.
-fix_includes() {
+# On OS X we need to add some symlinks when frameworks are being
+# used, to avoid complications with some more or less stupid packages.
+qt4_symlink_framework_headers() {
if use_if_iuse aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
local frw dest f h rdir
# Some packages tend to include <Qt/...>
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
@ 2015-06-11 18:33 Davide Pesavento (pesa)
0 siblings, 0 replies; 19+ messages in thread
From: Davide Pesavento (pesa) @ 2015-06-11 18:33 UTC (permalink / raw
To: gentoo-commits
pesa 15/06/11 18:33:54
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Use usex().
Revision Changes Path
1.1652 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1652&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1652&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1651&r2=1.1652
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1651
retrieving revision 1.1652
diff -u -r1.1651 -r1.1652
--- ChangeLog 10 Jun 2015 18:08:02 -0000 1.1651
+++ ChangeLog 11 Jun 2015 18:33:54 -0000 1.1652
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1651 2015/06/10 18:08:02 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1652 2015/06/11 18:33:54 pesa Exp $
+
+ 11 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
+ Use usex().
10 Jun 2015; <grknight@gentoo.org> mysql-multilib.eclass:
Resolve cirucular dependency for bug 551686; Make USE=cluster die early for
1.20 eclass/qt4-build-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.19&r2=1.20
Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- qt4-build-multilib.eclass 9 Jun 2015 21:12:50 -0000 1.19
+++ qt4-build-multilib.eclass 11 Jun 2015 18:33:54 -0000 1.20
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.19 2015/06/09 21:12:50 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.20 2015/06/11 18:33:54 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -368,7 +368,7 @@
-nomake demos
# disable rpath on non-prefix (bugs 380415 and 417169)
- $(use prefix || echo -no-rpath)
+ $(usex prefix '' -no-rpath)
# verbosity of the configure and build phases
-verbose $(${QT4_VERBOSE_BUILD} || echo -silent)
@@ -531,22 +531,30 @@
# @FUNCTION: qt_use
# @USAGE: <flag> [feature] [enableval]
# @DESCRIPTION:
+# <flag> is the name of a flag in IUSE.
+#
# Outputs "-${enableval}-${feature}" if <flag> is enabled, "-no-${feature}"
# otherwise. If [feature] is not specified, <flag> is used in its place.
# If [enableval] is not specified, the "-${enableval}" prefix is omitted.
qt_use() {
- use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
+ [[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
+
+ usex "$1" "${3:+-$3}-${2:-$1}" "-no-${2:-$1}"
}
# @FUNCTION: qt_native_use
# @USAGE: <flag> [feature] [enableval]
# @DESCRIPTION:
+# <flag> is the name of a flag in IUSE.
+#
# Outputs "-${enableval}-${feature}" if <flag> is enabled and we are currently
# building for the native ABI, "-no-${feature}" otherwise. If [feature] is not
# specified, <flag> is used in its place. If [enableval] is not specified,
# the "-${enableval}" prefix is omitted.
qt_native_use() {
- multilib_is_native_abi && use "$1" && echo "${3:+-$3}-${2:-$1}" || echo "-no-${2:-$1}"
+ [[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument"
+
+ multilib_is_native_abi && qt_use "$@" || echo "-no-${2:-$1}"
}
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
@ 2015-06-12 1:44 Davide Pesavento (pesa)
0 siblings, 0 replies; 19+ messages in thread
From: Davide Pesavento (pesa) @ 2015-06-12 1:44 UTC (permalink / raw
To: gentoo-commits
pesa 15/06/12 01:44:17
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Don't die when trying to rmdir non-existent directory (bug 551676).
Revision Changes Path
1.1653 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1653&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1653&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1652&r2=1.1653
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1652
retrieving revision 1.1653
diff -u -r1.1652 -r1.1653
--- ChangeLog 11 Jun 2015 18:33:54 -0000 1.1652
+++ ChangeLog 12 Jun 2015 01:44:17 -0000 1.1653
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1652 2015/06/11 18:33:54 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1653 2015/06/12 01:44:17 pesa Exp $
+
+ 12 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
+ Don't die when trying to rmdir non-existent directory (bug 551676).
11 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
Use usex().
1.21 eclass/qt4-build-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.20&r2=1.21
Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- qt4-build-multilib.eclass 11 Jun 2015 18:33:54 -0000 1.20
+++ qt4-build-multilib.eclass 12 Jun 2015 01:44:17 -0000 1.21
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.20 2015/06/11 18:33:54 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.21 2015/06/12 01:44:17 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -470,7 +470,7 @@
mv "${pcfile}" "${ED}"/usr/$(get_libdir)/pkgconfig || die
done
eshopts_pop
- rmdir "${D}/${QT4_LIBDIR}"/pkgconfig || die
+ rmdir "${D}/${QT4_LIBDIR}"/pkgconfig
qt4_install_module_qconfigs
qt4_symlink_framework_headers
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
@ 2015-06-13 16:10 Davide Pesavento (pesa)
0 siblings, 0 replies; 19+ messages in thread
From: Davide Pesavento (pesa) @ 2015-06-13 16:10 UTC (permalink / raw
To: gentoo-commits
pesa 15/06/13 16:10:09
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Simplify move of .pc files.
Revision Changes Path
1.1657 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1657&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1657&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1656&r2=1.1657
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1656
retrieving revision 1.1657
diff -u -r1.1656 -r1.1657
--- ChangeLog 13 Jun 2015 00:35:35 -0000 1.1656
+++ ChangeLog 13 Jun 2015 16:10:09 -0000 1.1657
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1656 2015/06/13 00:35:35 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1657 2015/06/13 16:10:09 pesa Exp $
+
+ 13 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
+ Simplify move of .pc files.
13 Jun 2015; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
mozconfig-v4.31.eclass:
1.22 eclass/qt4-build-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.21&r2=1.22
Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- qt4-build-multilib.eclass 12 Jun 2015 01:44:17 -0000 1.21
+++ qt4-build-multilib.eclass 13 Jun 2015 16:10:09 -0000 1.22
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.21 2015/06/12 01:44:17 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.22 2015/06/13 16:10:09 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -462,15 +462,10 @@
fi
fi
- # move pkgconfig files to the correct location
- eshopts_push -s nullglob
- local pcfile
- for pcfile in "${D}/${QT4_LIBDIR}"/pkgconfig/*.pc; do
- dodir /usr/$(get_libdir)/pkgconfig
- mv "${pcfile}" "${ED}"/usr/$(get_libdir)/pkgconfig || die
- done
- eshopts_pop
- rmdir "${D}/${QT4_LIBDIR}"/pkgconfig
+ # move pkgconfig directory to the correct location
+ if [[ -d ${D}${QT4_LIBDIR}/pkgconfig ]]; then
+ mv "${D}${QT4_LIBDIR}"/pkgconfig "${ED}usr/$(get_libdir)" || die
+ fi
qt4_install_module_qconfigs
qt4_symlink_framework_headers
@@ -754,7 +749,7 @@
dosym "${rdir}"/${f}/Headers "${dest}"
# Link normal headers as well.
- for hdr in "${D}/${QT4_LIBDIR}/${f}"/Headers/*; do
+ for hdr in "${D}${QT4_LIBDIR}/${f}"/Headers/*; do
h=$(basename ${hdr})
dosym "../${rdir}"/${f}/Headers/${h} \
"${QT4_HEADERDIR#${EPREFIX}}"/Qt/${h}
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
@ 2015-06-13 17:28 Davide Pesavento (pesa)
0 siblings, 0 replies; 19+ messages in thread
From: Davide Pesavento (pesa) @ 2015-06-13 17:28 UTC (permalink / raw
To: gentoo-commits
pesa 15/06/13 17:28:13
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Workaround gcc-4.8 ICE in qtdeclarative (bug 551560).
Revision Changes Path
1.1659 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1659&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1659&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1658&r2=1.1659
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1658
retrieving revision 1.1659
diff -u -r1.1658 -r1.1659
--- ChangeLog 13 Jun 2015 17:24:25 -0000 1.1658
+++ ChangeLog 13 Jun 2015 17:28:13 -0000 1.1659
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1658 2015/06/13 17:24:25 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1659 2015/06/13 17:28:13 pesa Exp $
+
+ 13 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
+ Workaround gcc-4.8 ICE in qtdeclarative (bug 551560).
13 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
-gnome-python-common.eclass:
1.23 eclass/qt4-build-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.22&r2=1.23
Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- qt4-build-multilib.eclass 13 Jun 2015 16:10:09 -0000 1.22
+++ qt4-build-multilib.eclass 13 Jun 2015 17:28:13 -0000 1.23
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.22 2015/06/13 16:10:09 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.23 2015/06/13 17:28:13 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -171,9 +171,20 @@
fi
fi
+ if [[ ${PN} == qtdeclarative ]]; then
+ # Bug 551560
+ # gcc-4.8 ICE with -Os, fixed in 4.9
+ if use x86 && [[ $(gcc-version) == 4.8 ]]; then
+ replace-flags -Os -O2
+ fi
+ fi
+
if [[ ${PN} == qtwebkit ]]; then
# Bug 550780
- filter-flags -fgraphite-identity -floop-strip-mine
+ # various ICEs with graphite-related flags, gcc-5 works
+ if [[ $(gcc-major-version) -lt 5 ]]; then
+ filter-flags -fgraphite-identity -floop-strip-mine
+ fi
fi
# Bug 261632
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
@ 2015-06-13 22:13 Davide Pesavento (pesa)
0 siblings, 0 replies; 19+ messages in thread
From: Davide Pesavento (pesa) @ 2015-06-13 22:13 UTC (permalink / raw
To: gentoo-commits
pesa 15/06/13 22:13:24
Modified: ChangeLog qt4-build-multilib.eclass
Log:
sh is "supported", don't fallback to generic.
Also, don't die when tc-arch is unknown, the configure script can handle this internally.
Revision Changes Path
1.1661 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1661&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1661&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1660&r2=1.1661
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1660
retrieving revision 1.1661
diff -u -r1.1660 -r1.1661
--- ChangeLog 13 Jun 2015 19:01:10 -0000 1.1660
+++ ChangeLog 13 Jun 2015 22:13:24 -0000 1.1661
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1660 2015/06/13 19:01:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1661 2015/06/13 22:13:24 pesa Exp $
+
+ 13 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
+ sh is "supported", don't fallback to generic. Also, don't die when tc-arch is
+ unknown, the configure script can handle this internally.
13 Jun 2015; Andreas K. Huettel <dilfridge@gentoo.org> perl-module.eclass:
Allow dev-perl/Module-Build in QA check for Module::Build
1.24 eclass/qt4-build-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.23&r2=1.24
Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- qt4-build-multilib.eclass 13 Jun 2015 17:28:13 -0000 1.23
+++ qt4-build-multilib.eclass 13 Jun 2015 22:13:24 -0000 1.24
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.23 2015/06/13 17:28:13 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.24 2015/06/13 22:13:24 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -300,17 +300,15 @@
STRIP=$(tc-getSTRIP)
# convert tc-arch to the values supported by Qt
- local arch=
- case $(tc-arch) in
- amd64|x64-*) arch=x86_64 ;;
- ppc*-macos) arch=ppc ;;
- ppc*) arch=powerpc ;;
- sparc*) arch=sparc ;;
- x86-macos) arch=x86 ;;
- x86*) arch=i386 ;;
- alpha|arm|ia64|mips|s390) arch=$(tc-arch) ;;
- arm64|hppa|sh) arch=generic ;;
- *) die "qt4-build-multilib.eclass: unsupported tc-arch '$(tc-arch)'" ;;
+ local arch=$(tc-arch)
+ case ${arch} in
+ amd64|x64-*) arch=x86_64 ;;
+ arm64|hppa) arch=generic ;;
+ ppc*-macos) arch=ppc ;;
+ ppc*) arch=powerpc ;;
+ sparc*) arch=sparc ;;
+ x86-macos) arch=x86 ;;
+ x86*) arch=i386 ;;
esac
# configure arguments
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
@ 2015-06-13 22:57 Davide Pesavento (pesa)
0 siblings, 0 replies; 19+ messages in thread
From: Davide Pesavento (pesa) @ 2015-06-13 22:57 UTC (permalink / raw
To: gentoo-commits
pesa 15/06/13 22:57:59
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Export MAKEFLAGS and OBJDUMP.
Revision Changes Path
1.1662 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1662&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1662&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1661&r2=1.1662
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1661
retrieving revision 1.1662
diff -u -r1.1661 -r1.1662
--- ChangeLog 13 Jun 2015 22:13:24 -0000 1.1661
+++ ChangeLog 13 Jun 2015 22:57:59 -0000 1.1662
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1661 2015/06/13 22:13:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1662 2015/06/13 22:57:59 pesa Exp $
+
+ 13 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
+ Export MAKEFLAGS and OBJDUMP.
13 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
sh is "supported", don't fallback to generic. Also, don't die when tc-arch is
1.25 eclass/qt4-build-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.24&r2=1.25
Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- qt4-build-multilib.eclass 13 Jun 2015 22:13:24 -0000 1.24
+++ qt4-build-multilib.eclass 13 Jun 2015 22:57:59 -0000 1.25
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.24 2015/06/13 22:13:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.25 2015/06/13 22:57:59 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -296,7 +296,9 @@
CC=$(tc-getCC) \
CXX=$(tc-getCXX) \
LD=$(tc-getCXX) \
+ MAKEFLAGS=${MAKEOPTS} \
OBJCOPY=$(tc-getOBJCOPY) \
+ OBJDUMP=$(tc-getOBJDUMP) \
STRIP=$(tc-getSTRIP)
# convert tc-arch to the values supported by Qt
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
@ 2015-06-16 17:49 Davide Pesavento (pesa)
0 siblings, 0 replies; 19+ messages in thread
From: Davide Pesavento (pesa) @ 2015-06-16 17:49 UTC (permalink / raw
To: gentoo-commits
pesa 15/06/16 17:49:13
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Drop QT4_VERBOSE_BUILD variable (always true now).
Revision Changes Path
1.1667 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1667&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1667&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1666&r2=1.1667
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1666
retrieving revision 1.1667
diff -u -r1.1666 -r1.1667
--- ChangeLog 16 Jun 2015 17:47:24 -0000 1.1666
+++ ChangeLog 16 Jun 2015 17:49:13 -0000 1.1667
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1666 2015/06/16 17:47:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1667 2015/06/16 17:49:13 pesa Exp $
+
+ 16 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
+ Drop QT4_VERBOSE_BUILD variable (always true now).
16 Jun 2015; Davide Pesavento <pesa@gentoo.org> qmake-utils.eclass:
Use use_if_iuse().
1.27 eclass/qt4-build-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.26&r2=1.27
Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- qt4-build-multilib.eclass 13 Jun 2015 23:05:46 -0000 1.26
+++ qt4-build-multilib.eclass 16 Jun 2015 17:49:13 -0000 1.27
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.26 2015/06/13 23:05:46 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.27 2015/06/16 17:49:13 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -88,11 +88,6 @@
# Space-separated list of directories that will be configured,
# compiled, and installed. All paths must be relative to ${S}.
-# @ECLASS-VARIABLE: QT4_VERBOSE_BUILD
-# @DESCRIPTION:
-# Set to false to reduce build output during compilation.
-: ${QT4_VERBOSE_BUILD:=true}
-
# @ECLASS-VARIABLE: QCONFIG_ADD
# @DEFAULT_UNSET
# @DESCRIPTION:
@@ -381,8 +376,8 @@
# disable rpath on non-prefix (bugs 380415 and 417169)
$(usex prefix '' -no-rpath)
- # verbosity of the configure and build phases
- -verbose $(${QT4_VERBOSE_BUILD} || echo -silent)
+ # print verbose information about each configure test
+ -verbose
# precompiled headers don't work on hardened, where the flag is masked
$(in_iuse pch && qt_use pch || echo -no-pch)
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
@ 2015-06-16 21:38 Davide Pesavento (pesa)
0 siblings, 0 replies; 19+ messages in thread
From: Davide Pesavento (pesa) @ 2015-06-16 21:38 UTC (permalink / raw
To: gentoo-commits
pesa 15/06/16 21:38:00
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Minor changes to reduce diff with qt5-build.eclass
Revision Changes Path
1.1668 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1668&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1668&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1667&r2=1.1668
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1667
retrieving revision 1.1668
diff -u -r1.1667 -r1.1668
--- ChangeLog 16 Jun 2015 17:49:13 -0000 1.1667
+++ ChangeLog 16 Jun 2015 21:38:00 -0000 1.1668
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1667 2015/06/16 17:49:13 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1668 2015/06/16 21:38:00 pesa Exp $
+
+ 16 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
+ Minor changes to reduce diff with qt5-build.eclass
16 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass:
Drop QT4_VERBOSE_BUILD variable (always true now).
1.28 eclass/qt4-build-multilib.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.27&r2=1.28
Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- qt4-build-multilib.eclass 16 Jun 2015 17:49:13 -0000 1.27
+++ qt4-build-multilib.eclass 16 Jun 2015 21:38:00 -0000 1.28
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.27 2015/06/16 17:49:13 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.28 2015/06/16 21:38:00 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -25,16 +25,12 @@
case ${PV} in
4.?.9999)
+ # git stable branch
QT4_BUILD_TYPE="live"
- EGIT_REPO_URI=(
- "git://code.qt.io/qt/qt.git"
- "https://code.qt.io/git/qt/qt.git"
- "https://github.com/qtproject/qt.git"
- )
EGIT_BRANCH=${PV%.9999}
- inherit git-r3
;;
*)
+ # official stable release
QT4_BUILD_TYPE="release"
MY_P=qt-everywhere-opensource-src-${PV/_/-}
SRC_URI="http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz"
@@ -42,6 +38,13 @@
;;
esac
+EGIT_REPO_URI=(
+ "git://code.qt.io/qt/qt.git"
+ "https://code.qt.io/git/qt/qt.git"
+ "https://github.com/qtproject/qt.git"
+)
+[[ ${QT4_BUILD_TYPE} == live ]] && inherit git-r3
+
if [[ ${PN} != qttranslations ]]; then
IUSE="aqua debug pch"
[[ ${PN} != qtxmlpatterns ]] && IUSE+=" +exceptions"
@@ -507,21 +510,19 @@
find "${S}"/src/${moduledir} -type f -name '*_p.h' -exec doins '{}' + || die
fi
- # remove .la files since we are building only shared libraries
prune_libtool_files
}
# @FUNCTION: qt4-build-multilib_pkg_postinst
# @DESCRIPTION:
-# Regenerate configuration, plus throw a message about possible
-# breakages and proposed solutions.
+# Regenerate configuration after installation or upgrade/downgrade.
qt4-build-multilib_pkg_postinst() {
qt4_regenerate_global_qconfigs
}
# @FUNCTION: qt4-build-multilib_pkg_postrm
# @DESCRIPTION:
-# Regenerate configuration when the package is completely removed.
+# Regenerate configuration when a module is completely removed.
qt4-build-multilib_pkg_postrm() {
qt4_regenerate_global_qconfigs
}
@@ -590,16 +591,19 @@
# @DESCRIPTION:
# Executes the given command inside each directory listed in QT4_TARGET_DIRECTORIES.
qt4_foreach_target_subdir() {
- local subdir
+ local ret=0 subdir=
for subdir in ${QT4_TARGET_DIRECTORIES}; do
mkdir -p "${subdir}" || die
pushd "${subdir}" >/dev/null || die
einfo "Running $* ${subdir:+in ${subdir}}"
"$@"
+ ((ret+=$?))
popd >/dev/null || die
done
+
+ return ${ret}
}
# @FUNCTION: qt4_symlink_tools_to_build_dir
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2015-06-16 21:38 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-31 13:56 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass Davide Pesavento (pesa)
-- strict thread matches above, loose matches on Subject: below --
2015-06-16 21:38 Davide Pesavento (pesa)
2015-06-16 17:49 Davide Pesavento (pesa)
2015-06-13 22:57 Davide Pesavento (pesa)
2015-06-13 22:13 Davide Pesavento (pesa)
2015-06-13 17:28 Davide Pesavento (pesa)
2015-06-13 16:10 Davide Pesavento (pesa)
2015-06-12 1:44 Davide Pesavento (pesa)
2015-06-11 18:33 Davide Pesavento (pesa)
2015-06-09 21:12 Davide Pesavento (pesa)
2015-06-09 18:13 Davide Pesavento (pesa)
2015-05-10 1:06 Davide Pesavento (pesa)
2015-05-09 19:51 Davide Pesavento (pesa)
2015-05-09 19:48 Davide Pesavento (pesa)
2015-05-09 18:19 Davide Pesavento (pesa)
2015-04-22 20:23 Davide Pesavento (pesa)
2014-12-18 14:35 Davide Pesavento (pesa)
2014-11-17 0:24 Davide Pesavento (pesa)
2014-11-13 1:45 Davide Pesavento (pesa)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox