* [gentoo-commits] gentoo-x86 commit in eclass: qt4-build.eclass qt4.eclass
@ 2009-05-22 22:21 Markos Chandras (hwoarang)
0 siblings, 0 replies; 2+ messages in thread
From: Markos Chandras (hwoarang) @ 2009-05-22 22:21 UTC (permalink / raw
To: gentoo-commits
hwoarang 09/05/22 22:21:38
Modified: qt4-build.eclass qt4.eclass
Log:
Prepare eclasses for eclass-manpage package. Clean up qt4.eclass. Thanks to mren and Davide for the help.Fixes bug 209626
Revision Changes Path
1.34 eclass/qt4-build.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.33&r2=1.34
Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- qt4-build.eclass 12 May 2009 14:21:22 -0000 1.33
+++ qt4-build.eclass 22 May 2009 22:21:38 -0000 1.34
@@ -1,6 +1,6 @@
# Copyright 2007-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.33 2009/05/12 14:21:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.34 2009/05/22 22:21:38 hwoarang Exp $
# @ECLASS: qt4-build.eclass
# @MAINTAINER:
@@ -40,6 +40,9 @@
LICENSE="|| ( LGPL-2.1 GPL-3 )"
fi
+# @FUNCTION: qt4-build_pkg_setup
+# @DESCRIPTION:
+# Sets up installation directories, PLATFORM, PATH, and LD_LIBRARY_PATH
qt4-build_pkg_setup() {
# EAPI=2 ebuilds set use-deps, others need this:
if [[ $EAPI != 2 ]]; then
@@ -90,6 +93,19 @@
}
+# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
+# @DESCRIPTION:
+# Arguments for build_target_directories. Takes the directories, in which the
+# code should be compiled. This is a space-separated list
+
+# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES
+# @DESCRIPTION:
+# Space separated list including the directories that will be extracted from Qt
+# tarball
+
+# @FUNCTION: qt4-build_src_unpack
+# @DESCRIPTION:
+# Unpacks the sources
qt4-build_src_unpack() {
local target targets licenses
if version_is_at_least 4.5 ${PV} ; then
@@ -119,6 +135,11 @@
fi
}
+
+# @FUNCTION: qt4-build_src_prepare
+# @DESCRIPTION:
+# Prepare the sources before the configure phase. Strip CFLAGS if necessary, and fix
+# source files in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified on /etc/make.conf.
qt4-build_src_prepare() {
cd "${S}"
@@ -163,6 +184,9 @@
}
+# @FUNCTION: qt4-build_src_configure
+# @DESCRIPTION:
+# Default configure phase
qt4-build_src_configure() {
myconf="$(standard_configure_options) ${myconf}"
@@ -171,6 +195,8 @@
./configure ${myconf} || die "./configure failed"
}
+# @FUNCTION: qt4-build_src_compile
+# @DESCRIPTION: Actual compile phase
qt4-build_src_compile() {
# Be backwards compatible for now
if [[ $EAPI != 2 ]]; then
@@ -180,12 +206,19 @@
build_directories "${QT4_TARGET_DIRECTORIES}"
}
+# @FUNCTION: qt4-build_src_install
+# @DESCRIPTION:
+# Perform the actual installation including some library fixes.
qt4-build_src_install() {
install_directories "${QT4_TARGET_DIRECTORIES}"
install_qconfigs
fix_library_files
}
+# @FUNCTION: standard_configure_options
+# @DESCRIPTION:
+# Sets up some standard configure options, like libdir (if necessary), whether
+# debug info is wanted or not.
standard_configure_options() {
local myconf=""
@@ -241,9 +274,20 @@
;;
esac
+ # bug 270475
+ case "${MY_PV}" in
+ 4.5.1 | 4.5.2)
+ myconf="${myconf} -platform $(qt_mkspecs_dir)"
+ ;;
+ esac
+
echo "${myconf}"
}
+# @FUNCTION: build_directories
+# @USAGE: < directories >
+# @DESCRIPTION:
+# Compiles the code in $QT4_TARGET_DIRECTORIES
build_directories() {
local dirs="$@"
for x in ${dirs}; do
@@ -253,6 +297,10 @@
done
}
+# @FUNCTION: install_directories
+# @USAGE: < directories >
+# @DESCRIPTION:
+# run emake install in the given directories, which are separated by spaces
install_directories() {
local dirs="$@"
for x in ${dirs}; do
@@ -277,6 +325,8 @@
# List variables that should be defined at the top of QtCore/qconfig.h
QCONFIG_DEFINE="${QCONFIG_DEFINE:-}"
+# @FUNCTION: install_qconfigs
+# @DESCRIPTION: Install gentoo-specific mkspecs configurations
install_qconfigs() {
local x
if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
@@ -296,6 +346,8 @@
fi
}
+# @FUNCTION: generate_qconfigs
+# @DESCRIPTION: Generates gentoo-specific configurations
generate_qconfigs() {
if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE} || ${CATEGORY}/${PN} == x11-libs/qt-core ]]; then
local x qconfig_add qconfig_remove qconfig_new
@@ -352,10 +404,15 @@
fi
}
+# @FUNCTION: qt4-build_pkg_postrm
+# @DESCRIPTION: Generate configurations when the package is completely removed
qt4-build_pkg_postrm() {
generate_qconfigs
}
+# @FUNCTION: qt4-build_pkg_postinst
+# @DESCRIPTION: Generate configuration, plus throws a message about possible
+# breakages and proposed solutions.
qt4-build_pkg_postinst() {
generate_qconfigs
echo
@@ -374,23 +431,37 @@
echo
}
+# @FUNCTION: skip_qmake_build_patch
+# @DESCRIPTION:
+# Don't need to build qmake, as it's already installed from qt-core
skip_qmake_build_patch() {
# Don't need to build qmake, as it's already installed from qt-core
sed -i -e "s:if true:if false:g" "${S}"/configure || die "Sed failed"
}
+# @FUNCTION: skip_project_generation_patch
+# @DESCRIPTION:
+# Exit the script early by throwing in an exit before all of the .pro files are scanned
skip_project_generation_patch() {
# Exit the script early by throwing in an exit before all of the .pro files are scanned
sed -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" \
-i "${S}"/configure || die "Sed failed"
}
+# @FUNCTION: symlink_binaries_to_buildtree
+# @DESCRIPTION:
+# Symlink generated binaries to buildtree so they can be used during compilation
+# time
symlink_binaries_to_buildtree() {
for bin in qmake moc uic rcc; do
ln -s ${QTBINDIR}/${bin} "${S}"/bin/ || die "Symlinking ${bin} to ${S}/bin failed."
done
}
+# @FUNCTION: fix_library_files
+# @DESCRIPTION:
+# Fixes the pathes in *.la, *.prl, *.pc, as they are wrong due to sandbox and
+# moves the *.pc-files into the pkgconfig directory
fix_library_files() {
for libfile in "${D}"/${QTLIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
if [[ -e ${libfile} ]]; then
@@ -404,7 +475,6 @@
sed -i -e "s:${S}/bin:${QTBINDIR}:g" ${libfile} || die "Sed failed"
# Move .pc files into the pkgconfig directory
-
dodir ${QTPCDIR}
mv ${libfile} "${D}"/${QTPCDIR}/ \
|| die "Moving ${libfile} to ${D}/${QTPCDIR}/ failed."
@@ -415,6 +485,13 @@
rmdir "${D}"/${QTLIBDIR}/pkgconfig
}
+# @FUNCTION: qt_use
+# @USAGE: < flag > [ feature ] [ enableval ]
+# @DESCRIPTION:
+# This will echo "${enableval}-${feature}" if <flag> is enabled, or
+# "-no-${feature} if the flag is disabled. If [feature] is not specified <flag>
+# will be used for that. If [enableval] is not specified, it omits the
+# assignment-part
qt_use() {
local flag="${1}"
local feature="${1}"
@@ -446,6 +523,7 @@
# Run built_with_use on each flag and print appropriate error messages if any
# flags are missing
+
_qt_built_with_use() {
local missing opt pkg flag flags
@@ -499,6 +577,10 @@
fi
}
+# @FUNCTION: qt_mkspecs_dir
+# @RETURN: the specs-directory w/o path
+# @DESCRIPTION:
+# Allows us to define which mkspecs dir we want to use.
qt_mkspecs_dir() {
# Allows us to define which mkspecs dir we want to use.
local spec
1.58 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.57&r2=1.58
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- qt4.eclass 17 May 2009 15:18:58 -0000 1.57
+++ qt4.eclass 22 May 2009 22:21:38 -0000 1.58
@@ -1,6 +1,6 @@
# Copyright 2005-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.57 2009/05/17 15:18:58 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.58 2009/05/22 22:21:38 hwoarang Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -189,34 +189,6 @@
base_src_prepare
}
-# @FUNCTION: qt4_src_configure
-# @DESCRIPTION:
-# Default src_configure function for packages that depend on qt4. If you have to
-# override src_configure in your ebuild, call qt4_src_configure in it.
-#qt4_src_configure() {
-# debug-print-function $FUNCNAME "$@"
-# eqmake4
-#}
-
-# @FUNCTION: qt4_src_compile
-# @DESCRIPTION:
-# Default src_compile function for packages that depend on qt4. If you have to
-# override src_compile in your ebuild (probably you don't need to), call
-# qt4_src_compile in it.
-#qt4_src_compile() {
-# debug-print-function $FUNCNAME "$@"
-# case "${EAPI:-0}" in
-# 2)
-# emake || die "emake failed"
-# ;;
-# 0|1)
-# qt4_src_prepare
-# qt4_src_configure
-# emake || die "emake failed"
-# ;;
-# esac
-#}
-
# @FUNCTION: eqmake4
# @USAGE: [.pro file] [additional parameters to qmake]
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4-build.eclass qt4.eclass
@ 2009-11-10 0:56 Dror Levin (spatz)
0 siblings, 0 replies; 2+ messages in thread
From: Dror Levin (spatz) @ 2009-11-10 0:56 UTC (permalink / raw
To: gentoo-commits
spatz 09/11/10 00:56:30
Modified: qt4-build.eclass qt4.eclass
Log:
Enable RPATH in Qt4 and Qt4 apps, fix bug 180872.
Revision Changes Path
1.51 eclass/qt4-build.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.50&r2=1.51
Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- qt4-build.eclass 9 Nov 2009 19:35:44 -0000 1.50
+++ qt4-build.eclass 10 Nov 2009 00:56:29 -0000 1.51
@@ -1,6 +1,6 @@
# Copyright 2007-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.50 2009/11/09 19:35:44 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.51 2009/11/10 00:56:29 spatz Exp $
# @ECLASS: qt4-build.eclass
# @MAINTAINER:
@@ -328,7 +328,7 @@
;;
esac
- myconf="${myconf} -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license -no-rpath
+ myconf="${myconf} -platform $(qt_mkspecs_dir) -stl -verbose -largefile -confirm-license
-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR}
-datadir ${QTDATADIR} -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR}
-plugindir ${QTPLUGINDIR} -sysconfdir ${QTSYSCONFDIR}
1.59 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.59&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.59&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.58&r2=1.59
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- qt4.eclass 22 May 2009 22:21:38 -0000 1.58
+++ qt4.eclass 10 Nov 2009 00:56:29 -0000 1.59
@@ -1,6 +1,6 @@
# Copyright 2005-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.58 2009/05/22 22:21:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.59 2009/11/10 00:56:29 spatz Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -274,7 +274,6 @@
QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS}" \
QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \
QMAKE_LFLAGS_DEBUG="${LDFLAGS}" \
- QMAKE_RPATH= \
QMAKE_STRIP= \
"${projectfile}" "${@}"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-11-10 0:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-10 0:56 [gentoo-commits] gentoo-x86 commit in eclass: qt4-build.eclass qt4.eclass Dror Levin (spatz)
-- strict thread matches above, loose matches on Subject: below --
2009-05-22 22:21 Markos Chandras (hwoarang)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox