* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2007-10-10 18:17 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2007-10-10 18:17 UTC (permalink / raw
To: gentoo-commits
george 07/10/10 18:17:58
Modified: gnatbuild.eclass
Log:
fixed src_install issue, no longer relies on portage leaking env vars between functions
Revision Changes Path
1.34 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.33&r2=1.34
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gnatbuild.eclass 5 Sep 2007 14:11:00 -0000 1.33
+++ gnatbuild.eclass 10 Oct 2007 18:17:58 -0000 1.34
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.33 2007/09/05 14:11:00 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.34 2007/10/10 18:17:58 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -513,6 +513,21 @@
case $1 in
install) # runs provided make install
debug-print-section install
+
+ # Looks like we need an access to the bootstrap compiler here too
+ # as gnat apparently wants to compile something during the installation
+ # The spotted obuser was xgnatugn, used to process gnat_ugn_urw.texi,
+ # during prepping the documentation.
+ export PATH="${GNATBOOT}/bin:${PATH}"
+ GNATLIB="${GNATBOOT}/lib/gnatgcc/${BOOT_TARGET}/${BOOT_SLOT}"
+
+ export CC="${GNATBOOT}/bin/gnatgcc"
+ export INCLUDE_DIR="${GNATLIB}/include"
+ export LIB_DIR="${GNATLIB}"
+ export LDFLAGS="-L${GNATLIB}"
+ export ADA_OBJECTS_PATH="${GNATLIB}/adalib"
+ export ADA_INCLUDE_PATH="${GNATLIB}/adainclude"
+
# Do not allow symlinks in /usr/lib/gcc/${CHOST}/${MY_PV}/include as
# this can break the build.
for x in "${GNATBUILD}"/gcc/include/* ; do
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2007-12-27 8:51 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2007-12-27 8:51 UTC (permalink / raw
To: gentoo-commits
george 07/12/27 08:51:48
Modified: gnatbuild.eclass
Log:
updated gnatbuild.eclass to support primary compilers (#151343)
Revision Changes Path
1.35 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.34&r2=1.35
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gnatbuild.eclass 10 Oct 2007 18:17:58 -0000 1.34
+++ gnatbuild.eclass 27 Dec 2007 08:51:47 -0000 1.35
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.34 2007/10/10 18:17:58 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.35 2007/12/27 08:51:47 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -17,10 +17,13 @@
IUSE="nls"
# multilib is supported via profiles now, multilib usevar is deprecated
-DEPEND="!dev-lang/gnat"
+DEPEND=">=app-admin/eselect-gnat-1.3"
RDEPEND="app-admin/eselect-gnat"
-#PROVIDE="virtual/gnat"
+# Note!
+# It may not be safe to source this at top level. Only source inside local
+# functions!
+GnatCommon="/usr/share/gnat/lib/gnat-common.bash"
#---->> globals and SLOT <<----
@@ -88,7 +91,8 @@
DATAPATH=${PREFIX}/share/${PN}-data/${CTARGET}/${SLOT}
# ATTN! the one below should match the path defined in eselect-gnat module
CONFIG_PATH="/usr/share/gnat/eselect"
-gnat_config_file="${D}/${CONFIG_PATH}/${CTARGET}-${PN}-${SLOT}"
+gnat_profile="${CTARGET}-${PN}-${SLOT}"
+gnat_config_file="${CONFIG_PATH}/${gnat_profile}"
# ebuild globals
@@ -142,27 +146,27 @@
local abi=$2
local var
- echo >> ${gnat_config_file}
+ echo >> "${D}/${gnat_config_file}"
if ! is_multilib ; then
- echo " ctarget=${CTARGET}" >> ${gnat_config_file}
+ echo " ctarget=${CTARGET}" >> "${D}/${gnat_config_file}"
else
- echo "[${abi}]" >> ${gnat_config_file}
+ echo "[${abi}]" >> "${D}/${gnat_config_file}"
var="CTARGET_${abi}"
if [[ -n ${!var} ]] ; then
- echo " ctarget=${!var}" >> ${gnat_config_file}
+ echo " ctarget=${!var}" >> "${D}/${gnat_config_file}"
else
var="CHOST_${abi}"
if [[ -n ${!var} ]] ; then
- echo " ctarget=${!var}" >> ${gnat_config_file}
+ echo " ctarget=${!var}" >> "${D}/${gnat_config_file}"
else
- echo " ctarget=${CTARGET}" >> ${gnat_config_file}
+ echo " ctarget=${CTARGET}" >> "${D}/${gnat_config_file}"
fi
fi
fi
var="CFLAGS_${abi}"
if [[ -n ${!var} ]] ; then
- echo " cflags=${!var}" >> ${gnat_config_file}
+ echo " cflags=${!var}" >> "${D}/${gnat_config_file}"
fi
}
@@ -172,19 +176,17 @@
dodir ${CONFIG_PATH}
- echo "[global]" > ${gnat_config_file}
- echo " version=${CTARGET}-${SLOT}" >> ${gnat_config_file}
- echo " binpath=${BINPATH}" >> ${gnat_config_file}
- echo " libexecpath=${LIBEXECPATH}" >> ${gnat_config_file}
- echo " ldpath=${LIBPATH}" >> ${gnat_config_file}
- echo " manpath=${DATAPATH}/man" >> ${gnat_config_file}
- echo " infopath=${DATAPATH}/info" >> ${gnat_config_file}
-# echo " alias_cc=gcc" >> ${compiler_config_file}
-# echo " stdcxx_incdir=${STDCXX_INCDIR##*/}" >> ${compiler_config_file}
- echo " bin_prefix=${CTARGET}" >> ${gnat_config_file}
+ echo "[global]" > "${D}/${gnat_config_file}"
+ echo " version=${CTARGET}-${SLOT}" >> "${D}/${gnat_config_file}"
+ echo " binpath=${BINPATH}" >> "${D}/${gnat_config_file}"
+ echo " libexecpath=${LIBEXECPATH}" >> "${D}/${gnat_config_file}"
+ echo " ldpath=${LIBPATH}" >> "${D}/${gnat_config_file}"
+ echo " manpath=${DATAPATH}/man" >> "${D}/${gnat_config_file}"
+ echo " infopath=${DATAPATH}/info" >> "${D}/${gnat_config_file}"
+ echo " bin_prefix=${CTARGET}" >> "${D}/${gnat_config_file}"
for abi in $(get_all_abis) ; do
- add_profile_eselect_conf "${gnat_config_file}" "${abi}"
+ add_profile_eselect_conf "${D}/${gnat_config_file}" "${abi}"
done
}
@@ -277,6 +279,18 @@
if should_we_eselect_gnat; then
do_gnat_config
fi
+
+ # if primary compiler list is empty, add this profile to the list, so
+ # that users are not left without active compilers (making sure that
+ # libs are getting built for at least one)
+ elog ""
+ . ${GnatCommon} || die "failed to source common code"
+ if [[ ! -f ${PRIMELIST} ]] || [[ ! -s ${PRIMELIST} ]]; then
+ echo "${gnat_profile}" > ${PRIMELIST}
+ elog "The list of primary compilers was empty and got assigned ${gnat_profile}."
+ fi
+ elog "Please edit ${PRIMELIST} and list there gnat profiles intended"
+ elog "for common use."
}
@@ -517,7 +531,7 @@
# Looks like we need an access to the bootstrap compiler here too
# as gnat apparently wants to compile something during the installation
# The spotted obuser was xgnatugn, used to process gnat_ugn_urw.texi,
- # during prepping the documentation.
+ # during preparison of the docs.
export PATH="${GNATBOOT}/bin:${PATH}"
GNATLIB="${GNATBOOT}/lib/gnatgcc/${BOOT_TARGET}/${BOOT_SLOT}"
@@ -545,13 +559,6 @@
cd "${GNATBUILD}"
make DESTDIR=${D} install || die
-# # The install itself. Straight make DESTDIR=${D} install causes access
-# # violation (unlink of gprmake). A siple workaround for now.
-# cd "${GNATBUILD}"
-# make DESTDIR=${D} bindir="${D}${BINPATH}" install || die
-# mv "${D}${D}${PREFIX}/${CTARGET}" "${D}${PREFIX}" \
-# || die "please post the fialed mv line to #178140"
-# rm -rf "${D}var"
#make a convenience info link
dosym ${DATAPATH}/info/gnat_ugn_unw.info ${DATAPATH}/info/gnat.info
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2008-02-11 15:12 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2008-02-11 15:12 UTC (permalink / raw
To: gentoo-commits
george 08/02/11 15:12:31
Modified: gnatbuild.eclass
Log:
few updates from toolchain.eclass, changed how patches are grouped, added few quotations
Revision Changes Path
1.36 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.35&r2=1.36
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnatbuild.eclass 27 Dec 2007 08:51:47 -0000 1.35
+++ gnatbuild.eclass 11 Feb 2008 15:12:31 -0000 1.36
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.35 2007/12/27 08:51:47 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.36 2008/02/11 15:12:31 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -8,7 +8,8 @@
# Note: HOMEPAGE and LICENSE are set in appropriate ebuild, as
# gnat is developed by FSF and AdaCore "in parallel"
-inherit eutils versionator toolchain-funcs flag-o-matic multilib libtool fixheadtails gnuconfig pax-utils
+inherit eutils versionator toolchain-funcs flag-o-matic multilib autotools \
+ libtool fixheadtails gnuconfig pax-utils
EXPORT_FUNCTIONS pkg_setup pkg_postinst pkg_postrm src_unpack src_compile src_install
@@ -54,11 +55,8 @@
# so tc-* functions are of no use here. The present versioning scheme makes
# GCCVER basically a part of PV, but *this may change*!!
#
-# NOTE:
-# GCCVER can, in principle, be set in the ebuild. While at present there is no reason to
-# do so, if this ever becomes the case don't forget to update this assignment
-# (to check if GCCVER was set first)
-GCCVER="${GNATRELEASE}"
+# GCCVER can be set in the ebuild.
+[[ -z ${GCCVER} ]] && GCCVER="${GNATRELEASE}"
# finally extract GCC version strings
@@ -246,19 +244,23 @@
disgusting_gcc_multilib_HACK() {
local config
local libdirs
- case $(tc-arch) in
- amd64)
- config="i386/t-linux64"
- libdirs="../$(get_abi_LIBDIR amd64) ../$(get_abi_LIBDIR x86)" \
- ;;
- ppc64)
- config="rs6000/t-linux64"
- libdirs="../$(get_abi_LIBDIR ppc64) ../$(get_abi_LIBDIR ppc)" \
- ;;
- esac
+ if has_multilib_profile ; then
+ case $(tc-arch) in
+ amd64)
+ config="i386/t-linux64"
+ libdirs="../$(get_abi_LIBDIR amd64) ../$(get_abi_LIBDIR x86)" \
+ ;;
+ ppc64)
+ config="rs6000/t-linux64"
+ libdirs="../$(get_abi_LIBDIR ppc64) ../$(get_abi_LIBDIR ppc)" \
+ ;;
+ esac
+ else
+ die "Your profile is no longer supported by portage."
+ fi
einfo "updating multilib directories to be: ${libdirs}"
- sed -i -e "s:^MULTILIB_OSDIRNAMES.*:MULTILIB_OSDIRNAMES = ${libdirs}:" ${S}/gcc/config/${config}
+ sed -i -e "s:^MULTILIB_OSDIRNAMES.*:MULTILIB_OSDIRNAMES = ${libdirs}:" "${S}"/gcc/config/${config}
}
@@ -283,7 +285,7 @@
# if primary compiler list is empty, add this profile to the list, so
# that users are not left without active compilers (making sure that
# libs are getting built for at least one)
- elog ""
+ elog
. ${GnatCommon} || die "failed to source common code"
if [[ ! -f ${PRIMELIST} ]] || [[ ! -s ${PRIMELIST} ]]; then
echo "${gnat_profile}" > ${PRIMELIST}
@@ -317,8 +319,10 @@
cd ${S}
# patching gcc sources, following the toolchain
- EPATCH_MULTI_MSG="Applying Gentoo patches ..." \
- epatch "${FILESDIR}"/patches/*.patch
+ if [[ -d "${FILESDIR}"/${SLOT} ]] ; then
+ EPATCH_MULTI_MSG="Applying Gentoo patches ..." \
+ epatch "${FILESDIR}"/${SLOT}/*.patch
+ fi
# Replacing obsolete head/tail with POSIX compliant ones
ht_fix_file */configure
@@ -343,7 +347,7 @@
# regenerate some configures tp fix ACT's omissions
pushd ${S}/gnattools &> /dev/null
- autoconf
+ eautoconf
popd &> /dev/null
;;
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2008-02-13 20:12 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2008-02-13 20:12 UTC (permalink / raw
To: gentoo-commits
george 08/02/13 20:12:18
Modified: gnatbuild.eclass
Log:
fixed quoting
Revision Changes Path
1.37 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.36&r2=1.37
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gnatbuild.eclass 11 Feb 2008 15:12:31 -0000 1.36
+++ gnatbuild.eclass 13 Feb 2008 20:12:17 -0000 1.37
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.36 2008/02/11 15:12:31 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.37 2008/02/13 20:12:17 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -317,7 +317,7 @@
unpack ${A}
pax-mark E $(find ${GNATBOOT} -name gnat1)
- cd ${S}
+ cd "${S}"
# patching gcc sources, following the toolchain
if [[ -d "${FILESDIR}"/${SLOT} ]] ; then
EPATCH_MULTI_MSG="Applying Gentoo patches ..." \
@@ -346,7 +346,7 @@
done
# regenerate some configures tp fix ACT's omissions
- pushd ${S}/gnattools &> /dev/null
+ pushd "${S}"/gnattools &> /dev/null
eautoconf
popd &> /dev/null
;;
@@ -364,7 +364,7 @@
# add -fPIC flag to shared libs for 3.4* backend
if [ "3.4" == "${GCCBRANCH}" ] ; then
cd ada
- epatch ${FILESDIR}/gnat-Make-lang.in.patch
+ epatch "${FILESDIR}"/gnat-Make-lang.in.patch
fi
mkdir -p "${GNATBUILD}"
@@ -476,10 +476,10 @@
debug-print-section make-tools
# Compile helper tools
cd "${GNATBOOT}"
- cp ${S}/gcc/ada/xtreeprs.adb .
- cp ${S}/gcc/ada/xsinfo.adb .
- cp ${S}/gcc/ada/xeinfo.adb .
- cp ${S}/gcc/ada/xnmake.adb .
+ cp "${S}"/gcc/ada/xtreeprs.adb .
+ cp "${S}"/gcc/ada/xsinfo.adb .
+ cp "${S}"/gcc/ada/xeinfo.adb .
+ cp "${S}"/gcc/ada/xnmake.adb .
gnatmake xtreeprs && \
gnatmake xsinfo && \
gnatmake xeinfo && \
@@ -562,7 +562,7 @@
cd "${GNATBUILD}"
- make DESTDIR=${D} install || die
+ make DESTDIR="${D}" install || die
#make a convenience info link
dosym ${DATAPATH}/info/gnat_ugn_unw.info ${DATAPATH}/info/gnat.info
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2008-04-12 7:47 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2008-04-12 7:47 UTC (permalink / raw
To: gentoo-commits
george 08/04/12 07:47:01
Modified: gnatbuild.eclass
Log:
made postinst message more informative
Revision Changes Path
1.38 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.37&r2=1.38
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- gnatbuild.eclass 13 Feb 2008 20:12:17 -0000 1.37
+++ gnatbuild.eclass 12 Apr 2008 07:47:00 -0000 1.38
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.37 2008/02/13 20:12:17 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.38 2008/04/12 07:47:00 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -228,6 +228,11 @@
elog ""
elog "The compiler has been installed as gnatgcc, and the coverage testing"
elog "tool as gnatgcov."
+ elog ""
+ elog "Ada handling in Gentoo allows you to have multiple gnat variants"
+ elog "installed in parallel and automatically manage Ada libs."
+ elog "Please take a look at the Ada project page for some documentation:"
+ elog "http://www.gentoo.org/proj/en/prog_lang/ada/index.xml"
}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2008-04-14 14:54 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2008-04-14 14:54 UTC (permalink / raw
To: gentoo-commits
george 08/04/14 14:54:22
Modified: gnatbuild.eclass
Log:
changed pkg_postrm to automatically deactivate unmerged gnat profile
Revision Changes Path
1.39 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.38&r2=1.39
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gnatbuild.eclass 12 Apr 2008 07:47:00 -0000 1.38
+++ gnatbuild.eclass 14 Apr 2008 14:54:21 -0000 1.39
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.38 2008/04/12 07:47:00 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.39 2008/04/14 14:54:21 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -200,9 +200,7 @@
curr_config=$(eselect --no-color gnat show | grep ${CTARGET} | awk '{ print $1 }') || return 0
[[ -z ${curr_config} ]] && return 0
- # extraction of profile prats and all the relevant logic of toolchain.eclass
- # is contained here in SLOT and PN vars. The answer basically is, whether
- # we have the same profile. A new one should not be enacted
+ # The logic is basically "try to keep the same profile if possible"
if [[ ${curr_config} == ${CTARGET}-${PN}-${SLOT} ]] ; then
return 0
@@ -285,6 +283,8 @@
gnatbuild_pkg_postinst() {
if should_we_eselect_gnat; then
do_gnat_config
+ else
+ eselect gnat update
fi
# if primary compiler list is empty, add this profile to the list, so
@@ -302,10 +302,12 @@
gnatbuild_pkg_postrm() {
- elog "If you are removing the last version of gnat in this SLOT, please manually run:"
- elog " rm /etc/env.d/55gnat-*"
- elog "(running this automatically from every pgk_postrm will break"
- elog "configuration in case an update was performed)."
+ # "eselect gnat update" now removes the env.d file if the corresponding
+ # gnat profile was unmerged
+ eselect gnat update
+ elog "If you just unmerged the last gnat in this SLOT, your active gnat"
+ elog "profile got unset. Please check what eselect gnat show tells you"
+ elog "and set the desired profile"
}
#---->> pkg_* <<----
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2008-07-06 13:00 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2008-07-06 13:00 UTC (permalink / raw
To: gentoo-commits
george 08/07/06 13:00:54
Modified: gnatbuild.eclass
Log:
made --enable-libada conditional on PN, as ACT's gnat does not like it
Revision Changes Path
1.40 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.39&r2=1.40
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gnatbuild.eclass 14 Apr 2008 14:54:21 -0000 1.39
+++ gnatbuild.eclass 6 Jul 2008 13:00:53 -0000 1.40
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.39 2008/04/14 14:54:21 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.40 2008/07/06 13:00:53 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -457,6 +457,12 @@
--disable-werror \
--disable-libunwind-exceptions"
+ # ACT's gnat-gpl does not line libada for whatever reason..
+ if ${PN} == ${PN_GnatGpl}; then
+ confgcc="${confgcc} --disable-libada"
+ else
+ confgcc="${confgcc} --enable-libada"
+ fi
# einfo "confgcc=${confgcc}"
cd "${GNATBUILD}"
@@ -471,7 +477,6 @@
--infodir=${DATAPATH}/info \
--program-prefix=gnat \
--enable-languages="c,ada" \
- --enable-libada \
--with-gcc \
--enable-threads=posix \
--enable-shared \
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2008-08-12 9:26 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2008-08-12 9:26 UTC (permalink / raw
To: gentoo-commits
george 08/08/12 09:26:20
Modified: gnatbuild.eclass
Log:
fixed conditional for gnat-gpl, #231534
Revision Changes Path
1.41 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.40&r2=1.41
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gnatbuild.eclass 6 Jul 2008 13:00:53 -0000 1.40
+++ gnatbuild.eclass 12 Aug 2008 09:26:19 -0000 1.41
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.40 2008/07/06 13:00:53 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.41 2008/08/12 09:26:19 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -457,8 +457,9 @@
--disable-werror \
--disable-libunwind-exceptions"
- # ACT's gnat-gpl does not line libada for whatever reason..
- if ${PN} == ${PN_GnatGpl}; then
+ # ACT's gnat-gpl does not like libada for whatever reason..
+ if [[ ${PN} == ${PN_GnatGpl} ]]; then
+ einfo "ACT's gnat-gpl does not like libada, disabling"
confgcc="${confgcc} --disable-libada"
else
confgcc="${confgcc} --enable-libada"
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2008-08-19 11:39 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2008-08-19 11:39 UTC (permalink / raw
To: gentoo-commits
george 08/08/19 11:39:57
Modified: gnatbuild.eclass
Log:
added changes to allow SLOT and BOOT_SLOT to be set in ebuild
Revision Changes Path
1.42 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.41&r2=1.42
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gnatbuild.eclass 12 Aug 2008 09:26:19 -0000 1.41
+++ gnatbuild.eclass 19 Aug 2008 11:39:56 -0000 1.42
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.41 2008/08/12 09:26:19 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.42 2008/08/19 11:39:56 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -66,7 +66,10 @@
GCCRELEASE=$(get_version_component_range 1-3 "${GCCVER}")
# SLOT logic, make it represent gcc backend, as this is what matters most
-SLOT="${GCCBRANCH}"
+# There are some special cases, so we allow it to be defined in the ebuild
+# ATTN!! If you set SLOT in the ebuild, don't forget to make sure that
+# BOOT_SLOT is also set properly!
+[[ -z ${SLOT} ]] && SLOT="${GCCBRANCH}"
# possible future crosscompilation support
export CTARGET=${CTARGET:-${CHOST}}
@@ -77,8 +80,9 @@
# Bootstrap CTARGET and SLOT logic. For now BOOT_TARGET=CHOST is "guaranteed" by
# profiles, so mostly watch out for the right SLOT used in the bootstrap.
+# As above, with SLOT, it may need to be defined in the ebuild
BOOT_TARGET=${CTARGET}
-BOOT_SLOT=${SLOT}
+[[ -z ${BOOT_SLOT} ]] && BOOT_SLOT=${SLOT}
# set our install locations
PREFIX=${GNATBUILD_PREFIX:-/usr} # not sure we need this hook, but may be..
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2008-11-29 0:46 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2008-11-29 0:46 UTC (permalink / raw
To: gentoo-commits
george 08/11/29 00:46:02
Modified: gnatbuild.eclass
Log:
tuning pax-marking to allow building on some hardened systems. Thank to markpk for suggestion (#249054)
Revision Changes Path
1.43 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.42&r2=1.43
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gnatbuild.eclass 19 Aug 2008 11:39:56 -0000 1.42
+++ gnatbuild.eclass 29 Nov 2008 00:46:02 -0000 1.43
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.42 2008/08/19 11:39:56 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.43 2008/11/29 00:46:02 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -326,7 +326,7 @@
case $1 in
base_unpack)
unpack ${A}
- pax-mark E $(find ${GNATBOOT} -name gnat1)
+ pax-mark pmsE $(find ${GNATBOOT} -name gnat1)
cd "${S}"
# patching gcc sources, following the toolchain
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2008-12-05 8:36 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2008-12-05 8:36 UTC (permalink / raw
To: gentoo-commits
george 08/12/05 08:36:00
Modified: gnatbuild.eclass
Log:
prepating for new bootstraps with simplified structure
Revision Changes Path
1.44 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.43&r2=1.44
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gnatbuild.eclass 29 Nov 2008 00:46:02 -0000 1.43
+++ gnatbuild.eclass 5 Dec 2008 08:36:00 -0000 1.44
@@ -1,12 +1,19 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.43 2008/11/29 00:46:02 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.44 2008/12/05 08:36:00 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
#
-# Note: HOMEPAGE and LICENSE are set in appropriate ebuild, as
-# gnat is developed by FSF and AdaCore "in parallel"
+# Notes:
+# HOMEPAGE and LICENSE are set in appropriate ebuild, as
+# gnat is developed by FSF and AdaCore "in parallel"
+#
+# The following vars can be set in ebuild before inheriting this eclass. They
+# will be respected:
+# SLOT
+# BOOT_SLOT - where old bootstrap is used as it works fine
+
inherit eutils versionator toolchain-funcs flag-o-matic multilib autotools \
libtool fixheadtails gnuconfig pax-utils
@@ -409,10 +416,14 @@
else
# Set some paths to our bootstrap compiler.
export PATH="${GNATBOOT}/bin:${PATH}"
- # !ATTN! the *installed* compilers have ${PN} as part of their
- # LIBPATH, while the *bootstrap* uses hardset "gnatgcc" in theirs
- # (which is referenced as GNATLIB below)
- GNATLIB="${GNATBOOT}/lib/gnatgcc/${BOOT_TARGET}/${BOOT_SLOT}"
+ # !ATTN! the bootstrap compilers have a very simplystic structure,
+ # so many paths are not identical to the installed ones.
+ # Plus it was simplified even more in new releases.
+ if [[ ${BOOT_SLOT} > 4.1 ]] ; then
+ GNATLIB="${GNATBOOT}/lib"
+ else
+ GNATLIB="${GNATBOOT}/lib/gnatgcc/${BOOT_TARGET}/${BOOT_SLOT}"
+ fi
export CC="${GNATBOOT}/bin/gnatgcc"
export INCLUDE_DIR="${GNATLIB}/include"
@@ -494,13 +505,13 @@
# Compile helper tools
cd "${GNATBOOT}"
cp "${S}"/gcc/ada/xtreeprs.adb .
- cp "${S}"/gcc/ada/xsinfo.adb .
- cp "${S}"/gcc/ada/xeinfo.adb .
- cp "${S}"/gcc/ada/xnmake.adb .
+ cp "${S}"/gcc/ada/xsinfo.adb .
+ cp "${S}"/gcc/ada/xeinfo.adb .
+ cp "${S}"/gcc/ada/xnmake.adb .
gnatmake xtreeprs && \
- gnatmake xsinfo && \
- gnatmake xeinfo && \
- gnatmake xnmake || die "building helper tools"
+ gnatmake xsinfo && \
+ gnatmake xeinfo && \
+ gnatmake xnmake || die "building helper tools"
;;
bootstrap)
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2008-12-08 13:29 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2008-12-08 13:29 UTC (permalink / raw
To: gentoo-commits
george 08/12/08 13:29:19
Modified: gnatbuild.eclass
Log:
rolling back pax-mark fix, as it creates problems for multiple libs
Revision Changes Path
1.45 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.44&r2=1.45
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gnatbuild.eclass 5 Dec 2008 08:36:00 -0000 1.44
+++ gnatbuild.eclass 8 Dec 2008 13:29:19 -0000 1.45
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.44 2008/12/05 08:36:00 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.45 2008/12/08 13:29:19 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -333,7 +333,7 @@
case $1 in
base_unpack)
unpack ${A}
- pax-mark pmsE $(find ${GNATBOOT} -name gnat1)
+ pax-mark E $(find ${GNATBOOT} -name gnat1)
cd "${S}"
# patching gcc sources, following the toolchain
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2009-02-03 13:58 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2009-02-03 13:58 UTC (permalink / raw
To: gentoo-commits
george 09/02/03 13:58:54
Modified: gnatbuild.eclass
Log:
fixing $(DESTDIR) omission in Make-lang.in (#252611)
Revision Changes Path
1.46 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.45&r2=1.46
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gnatbuild.eclass 8 Dec 2008 13:29:19 -0000 1.45
+++ gnatbuild.eclass 3 Feb 2009 13:58:54 -0000 1.46
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.45 2008/12/08 13:29:19 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.46 2009/02/03 13:58:54 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -385,6 +385,11 @@
epatch "${FILESDIR}"/gnat-Make-lang.in.patch
fi
+ # gcc sources as of 4.3 seem to have a common omission of $(DESTDIR),
+ # that leads to make install trying to rm -f file on live system.
+ # As we do not need this rm, we simply remove the whole line
+ sed -i -e "/\$(RM) \$(bindir)/d" "${S}"/gcc/ada/Make-lang.in
+
mkdir -p "${GNATBUILD}"
;;
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2009-04-25 10:46 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2009-04-25 10:46 UTC (permalink / raw
To: gentoo-commits
george 09/04/25 10:46:01
Modified: gnatbuild.eclass
Log:
added proper multilib support (#266769)
Revision Changes Path
1.47 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.46&r2=1.47
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gnatbuild.eclass 3 Feb 2009 13:58:54 -0000 1.46
+++ gnatbuild.eclass 25 Apr 2009 10:46:01 -0000 1.47
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.46 2009/02/03 13:58:54 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.47 2009/04/25 10:46:01 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -484,6 +484,14 @@
else
confgcc="${confgcc} --enable-libada"
fi
+
+ # multilib support
+ if is_multilib ; then
+ confgcc="${confgcc} --enable-multilib"
+ else
+ confgcc="${confgcc} --disable-multilib"
+ fi
+
# einfo "confgcc=${confgcc}"
cd "${GNATBUILD}"
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2009-08-30 9:09 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2009-08-30 9:09 UTC (permalink / raw
To: gentoo-commits
george 09/08/30 09:09:09
Modified: gnatbuild.eclass
Log:
commented out LD_vars, should not be set at compilation
Revision Changes Path
1.48 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.47&r2=1.48
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gnatbuild.eclass 25 Apr 2009 10:46:01 -0000 1.47
+++ gnatbuild.eclass 30 Aug 2009 09:09:09 -0000 1.48
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.47 2009/04/25 10:46:01 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.48 2009/08/30 09:09:09 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -436,9 +436,9 @@
export LDFLAGS="-L${GNATLIB}"
# additional vars from gnuada and elsewhere
- export LD_RUN_PATH="${LIBPATH}"
+ #export LD_RUN_PATH="${LIBPATH}"
export LIBRARY_PATH="${GNATLIB}"
- export LD_LIBRARY_PATH="${GNATLIB}"
+ #export LD_LIBRARY_PATH="${GNATLIB}"
# export COMPILER_PATH="${GNATBOOT}/bin/"
export ADA_OBJECTS_PATH="${GNATLIB}/adalib"
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2010-01-21 11:05 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2010-01-21 11:05 UTC (permalink / raw
To: gentoo-commits
george 10/01/21 11:05:54
Modified: gnatbuild.eclass
Log:
moved eautoconf fix to specific ebuild as it does not apply class-wide
Revision Changes Path
1.49 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.48&r2=1.49
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gnatbuild.eclass 30 Aug 2009 09:09:09 -0000 1.48
+++ gnatbuild.eclass 21 Jan 2010 11:05:54 -0000 1.49
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.48 2009/08/30 09:09:09 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.49 2010/01/21 11:05:54 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -363,10 +363,11 @@
eend $?
done
- # regenerate some configures tp fix ACT's omissions
- pushd "${S}"/gnattools &> /dev/null
- eautoconf
- popd &> /dev/null
+# this is only needed for gnat-gpl-4.1 and breaks for gnat-gcc, so
+# this block was moved to corresponding ebuild
+# pushd "${S}"/gnattools &> /dev/null
+# eautoconf
+# popd &> /dev/null
;;
common_prep)
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2010-01-22 13:27 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2010-01-22 13:27 UTC (permalink / raw
To: gentoo-commits
george 10/01/22 13:27:36
Modified: gnatbuild.eclass
Log:
removed optional (parsing FEATURES) remocal of extra docs per request in #278747
Revision Changes Path
1.50 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.49&r2=1.50
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gnatbuild.eclass 21 Jan 2010 11:05:54 -0000 1.49
+++ gnatbuild.eclass 22 Jan 2010 13:27:36 -0000 1.50
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.49 2010/01/21 11:05:54 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.50 2010/01/22 13:27:36 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -673,13 +673,8 @@
rm -f "${D}${BINPATH}/${CTARGET}-gcc-${GCCRELEASE}"
# remove duplicate docs
- cd "${D}${DATAPATH}"
- has noinfo ${FEATURES} \
- && rm -rf info \
- || rm -f info/{dir,gcc,cpp}*
- has noman ${FEATURES} \
- && rm -rf man \
- || rm -rf man/man7/
+ rm -f "${D}${DATAPATH}"/info/{dir,gcc,cpp}*
+ rm -rf "${D}${DATAPATH}"/man/man7/
;;
prep_env)
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2011-03-10 19:36 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2011-03-10 19:36 UTC (permalink / raw
To: gentoo-commits
george 11/03/10 19:36:24
Modified: gnatbuild.eclass
Log:
bunch of updates, long overdue and in prep for gnat-4.4 backend
Revision Changes Path
1.51 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?r1=1.50&r2=1.51
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gnatbuild.eclass 22 Jan 2010 13:27:36 -0000 1.50
+++ gnatbuild.eclass 10 Mar 2011 19:36:24 -0000 1.51
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.50 2010/01/22 13:27:36 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.51 2011/03/10 19:36:24 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -14,6 +14,8 @@
# SLOT
# BOOT_SLOT - where old bootstrap is used as it works fine
+#WANT_AUTOMAKE="1.8"
+#WANT_AUTOCONF="2.1"
inherit eutils versionator toolchain-funcs flag-o-matic multilib autotools \
libtool fixheadtails gnuconfig pax-utils
@@ -344,10 +346,10 @@
# Replacing obsolete head/tail with POSIX compliant ones
ht_fix_file */configure
- if ! is_crosscompile && is_multilib && \
- [[ ( $(tc-arch) == "amd64" || $(tc-arch) == "ppc64" ) && -z ${SKIP_MULTILIB_HACK} ]] ; then
- disgusting_gcc_multilib_HACK || die "multilib hack failed"
- fi
+# if ! is_crosscompile && is_multilib && \
+# [[ ( $(tc-arch) == "amd64" || $(tc-arch) == "ppc64" ) && -z ${SKIP_MULTILIB_HACK} ]] ; then
+# disgusting_gcc_multilib_HACK || die "multilib hack failed"
+# fi
# Fixup libtool to correctly generate .la files with portage
cd "${S}"
@@ -386,10 +388,12 @@
epatch "${FILESDIR}"/gnat-Make-lang.in.patch
fi
- # gcc sources as of 4.3 seem to have a common omission of $(DESTDIR),
+ # gcc 4.3 sources seem to have a common omission of $(DESTDIR),
# that leads to make install trying to rm -f file on live system.
# As we do not need this rm, we simply remove the whole line
- sed -i -e "/\$(RM) \$(bindir)/d" "${S}"/gcc/ada/Make-lang.in
+ if [ "4.3" == "${GCCBRANCH}" ] ; then
+ sed -i -e "/\$(RM) \$(bindir)/d" "${S}"/gcc/ada/Make-lang.in
+ fi
mkdir -p "${GNATBUILD}"
;;
@@ -433,6 +437,8 @@
export CC="${GNATBOOT}/bin/gnatgcc"
export INCLUDE_DIR="${GNATLIB}/include"
+ export C_INCLUDE_PATH="${GNATLIB}/include"
+ export CPLUS_INCLUDE_PATH="${GNATLIB}/include"
export LIB_DIR="${GNATLIB}"
export LDFLAGS="-L${GNATLIB}"
@@ -472,18 +478,31 @@
fi
# reasonably sane globals (from toolchain)
+ # also disable mudflap and ssp
confgcc="${confgcc} \
--with-system-zlib \
--disable-checking \
--disable-werror \
+ --disable-libmudflap \
+ --disable-libssp \
--disable-libunwind-exceptions"
# ACT's gnat-gpl does not like libada for whatever reason..
- if [[ ${PN} == ${PN_GnatGpl} ]]; then
- einfo "ACT's gnat-gpl does not like libada, disabling"
- confgcc="${confgcc} --disable-libada"
- else
+ if version_is_at_least 4.2 ; then
confgcc="${confgcc} --enable-libada"
+# else
+# einfo "ACT's gnat-gpl does not like libada, disabling"
+# confgcc="${confgcc} --disable-libada"
+ fi
+
+ # set some specifics available in later versions
+ if version_is_at_least 4.3 ; then
+ einfo "setting gnat thread model"
+ confgcc="${confgcc} --enable-threads=gnat"
+ confgcc="${confgcc} --enable-shared=boehm-gc,ada,libada"
+ else
+ confgcc="${confgcc} --enable-threads=posix"
+ confgcc="${confgcc} --enable-shared"
fi
# multilib support
@@ -493,7 +512,14 @@
confgcc="${confgcc} --disable-multilib"
fi
-# einfo "confgcc=${confgcc}"
+ # __cxa_atexit is "essential for fully standards-compliant handling of
+ # destructors", but apparently requires glibc.
+ if [[ ${CTARGET} == *-gnu* ]] ; then
+ confgcc="${confgcc} --enable-__cxa_atexit"
+ confgcc="${confgcc} --enable-clocale=gnu"
+ fi
+
+ einfo "confgcc=${confgcc}"
cd "${GNATBUILD}"
CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" "${S}"/configure \
@@ -508,9 +534,6 @@
--program-prefix=gnat \
--enable-languages="c,ada" \
--with-gcc \
- --enable-threads=posix \
- --enable-shared \
- --with-system-zlib \
${confgcc} || die "configure failed"
;;
@@ -522,6 +545,7 @@
cp "${S}"/gcc/ada/xsinfo.adb .
cp "${S}"/gcc/ada/xeinfo.adb .
cp "${S}"/gcc/ada/xnmake.adb .
+ cp "${S}"/gcc/ada/xutil.ad{s,b} .
gnatmake xtreeprs && \
gnatmake xsinfo && \
gnatmake xeinfo && \
@@ -579,10 +603,16 @@
# The spotted obuser was xgnatugn, used to process gnat_ugn_urw.texi,
# during preparison of the docs.
export PATH="${GNATBOOT}/bin:${PATH}"
- GNATLIB="${GNATBOOT}/lib/gnatgcc/${BOOT_TARGET}/${BOOT_SLOT}"
+ if [[ ${BOOT_SLOT} > 4.1 ]] ; then
+ GNATLIB="${GNATBOOT}/lib"
+ else
+ GNATLIB="${GNATBOOT}/lib/gnatgcc/${BOOT_TARGET}/${BOOT_SLOT}"
+ fi
export CC="${GNATBOOT}/bin/gnatgcc"
export INCLUDE_DIR="${GNATLIB}/include"
+ export C_INCLUDE_PATH="${GNATLIB}/include"
+ export CPLUS_INCLUDE_PATH="${GNATLIB}/include"
export LIB_DIR="${GNATLIB}"
export LDFLAGS="-L${GNATLIB}"
export ADA_OBJECTS_PATH="${GNATLIB}/adalib"
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2011-05-23 14:09 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2011-05-23 14:09 UTC (permalink / raw
To: gentoo-commits
george 11/05/23 14:09:04
Modified: gnatbuild.eclass
Log:
prepping for updated bootstrap
Revision Changes Path
1.52 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?r1=1.51&r2=1.52
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gnatbuild.eclass 10 Mar 2011 19:36:24 -0000 1.51
+++ gnatbuild.eclass 23 May 2011 14:09:04 -0000 1.52
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.51 2011/03/10 19:36:24 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.52 2011/05/23 14:09:04 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -436,9 +436,12 @@
fi
export CC="${GNATBOOT}/bin/gnatgcc"
- export INCLUDE_DIR="${GNATLIB}/include"
- export C_INCLUDE_PATH="${GNATLIB}/include"
- export CPLUS_INCLUDE_PATH="${GNATLIB}/include"
+ # CPATH is supposed to be applied for any language, thus
+ # superceding either of C/CPLUS/OBJC_INCLUDE_PATHs
+ export CPATH="${GNATLIB}/include"
+ #export INCLUDE_DIR="${GNATLIB}/include"
+ #export C_INCLUDE_PATH="${GNATLIB}/include"
+ #export CPLUS_INCLUDE_PATH="${GNATLIB}/include"
export LIB_DIR="${GNATLIB}"
export LDFLAGS="-L${GNATLIB}"
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2013-08-02 17:38 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2013-08-02 17:38 UTC (permalink / raw
To: gentoo-commits
george 13/08/02 17:38:57
Modified: gnatbuild.eclass
Log:
added basic checks for empty patch dirs
Revision Changes Path
1.56 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?r1=1.55&r2=1.56
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnatbuild.eclass 15 Sep 2012 16:16:53 -0000 1.55
+++ gnatbuild.eclass 2 Aug 2013 17:38:57 -0000 1.56
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.55 2012/09/15 16:16:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.56 2013/08/02 17:38:57 george Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -337,9 +337,16 @@
cd "${S}"
# patching gcc sources, following the toolchain
- if [[ -d "${FILESDIR}"/${SLOT} ]] ; then
- EPATCH_MULTI_MSG="Applying Gentoo patches ..." \
- epatch "${FILESDIR}"/${SLOT}/*.patch
+ # first, the common patches
+ if [[ -d "${FILESDIR}"/patches ]] && [[ ! -z $(ls "${FILESDIR}"/patches/*.patch 2>/dev/null) ]] ; then
+ EPATCH_MULTI_MSG="Applying common Gentoo patches ..." \
+ epatch "${FILESDIR}"/patches/*.patch
+ fi
+ #
+ # then per SLOT
+ if [[ -d "${FILESDIR}"/patches/${SLOT} ]] && [[ ! -z $(ls "${FILESDIR}"/patches/${SLOT}/*.patch 2>/dev/null) ]] ; then
+ EPATCH_MULTI_MSG="Applying SLOT-specific Gentoo patches ..." \
+ epatch "${FILESDIR}"/patches/${SLOT}/*.patch
fi
# Replacing obsolete head/tail with POSIX compliant ones
ht_fix_file */configure
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2013-11-14 6:20 Steve Arnold (nerdboy)
0 siblings, 0 replies; 23+ messages in thread
From: Steve Arnold (nerdboy) @ 2013-11-14 6:20 UTC (permalink / raw
To: gentoo-commits
nerdboy 13/11/14 06:20:07
Modified: gnatbuild.eclass
Log:
updated gnatbuild for new ebuilds and lto use flag handling
Revision Changes Path
1.57 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?r1=1.56&r2=1.57
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gnatbuild.eclass 2 Aug 2013 17:38:57 -0000 1.56
+++ gnatbuild.eclass 14 Nov 2013 06:20:06 -0000 1.57
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.56 2013/08/02 17:38:57 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.57 2013/11/14 06:20:06 nerdboy Exp $
#
# Author: George Shapovalov <george@gentoo.org>
# Belongs to: ada herd <ada@gentoo.org>
@@ -485,12 +485,19 @@
confgcc="${confgcc} --disable-nls"
fi
+ if [ "${GNATMINOR}" -ge "6" ] ; then
+ confgcc+=( $(use_enable lto) )
+ elif [ "${GNATMINOR}" -ge "5" ] ; then
+ confgcc+=( --disable-lto )
+ fi
+
# reasonably sane globals (from toolchain)
# also disable mudflap and ssp
confgcc="${confgcc} \
--with-system-zlib \
--disable-checking \
--disable-werror \
+ --disable-libgomp \
--disable-libmudflap \
--disable-libssp \
--disable-libunwind-exceptions"
@@ -554,6 +561,11 @@
cp "${S}"/gcc/ada/xeinfo.adb .
cp "${S}"/gcc/ada/xnmake.adb .
cp "${S}"/gcc/ada/xutil.ad{s,b} .
+ if [[ ${GNATMINOR} > 5 ]] ; then
+ cp "${S}"/gcc/ada/einfo.ad{s,b} .
+ cp "${S}"/gcc/ada/csinfo.adb .
+ cp "${S}"/gcc/ada/ceinfo.adb .
+ fi
gnatmake xtreeprs && \
gnatmake xsinfo && \
gnatmake xeinfo && \
@@ -645,7 +657,7 @@
make DESTDIR="${D}" install || die
#make a convenience info link
- dosym ${DATAPATH}/info/gnat_ugn_unw.info ${DATAPATH}/info/gnat.info
+ dosym ${DATAPATH}/info/gnat_ugn.info ${DATAPATH}/info/gnat.info
;;
move_libs)
@@ -713,6 +725,14 @@
# remove duplicate docs
rm -f "${D}${DATAPATH}"/info/{dir,gcc,cpp}*
rm -rf "${D}${DATAPATH}"/man/man7/
+
+ # fix .la path for lto plugin
+ if use lto ; then
+ sed -i -e \
+ "/libdir=/c\libdir='${LIBEXECPATH}'" \
+ "${D}${LIBEXECPATH}"/liblto_plugin.la \
+ || die "sed update of .la file failed!"
+ fi
;;
prep_env)
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2014-10-15 9:52 Steve Arnold (nerdboy)
0 siblings, 0 replies; 23+ messages in thread
From: Steve Arnold (nerdboy) @ 2014-10-15 9:52 UTC (permalink / raw
To: gentoo-commits
nerdboy 14/10/15 09:52:21
Modified: gnatbuild.eclass
Log:
simple fix for bug #440660
Revision Changes Path
1.62 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?r1=1.61&r2=1.62
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- gnatbuild.eclass 13 Jul 2014 16:19:33 -0000 1.61
+++ gnatbuild.eclass 15 Oct 2014 09:52:21 -0000 1.62
@@ -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/gnatbuild.eclass,v 1.61 2014/07/13 16:19:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.62 2014/10/15 09:52:21 nerdboy Exp $
#
# Authors: George Shapovalov <george@gentoo.org>
# Steve Arnold <nerdboy@gentoo.org>
@@ -313,7 +313,7 @@
elog "The list of primary compilers was empty and got assigned ${gnat_profile}."
fi
elog "Please edit ${PRIMELIST} and list there gnat profiles intended"
- elog "for common use."
+ elog "for common use, one per line."
}
@@ -773,6 +773,9 @@
"${D}${LIBEXECPATH}"/liblto_plugin.la \
|| die "sed update of .la file failed!"
fi
+
+ # add config directory (bug 440660)
+ keepdir /etc/ada
;;
prep_env)
^ permalink raw reply [flat|nested] 23+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass
@ 2014-10-17 13:17 George Shapovalov (george)
0 siblings, 0 replies; 23+ messages in thread
From: George Shapovalov (george) @ 2014-10-17 13:17 UTC (permalink / raw
To: gentoo-commits
george 14/10/17 13:17:30
Modified: gnatbuild.eclass
Log:
a fix to create /etc/ada, see #440660
Revision Changes Path
1.63 eclass/gnatbuild.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?r1=1.62&r2=1.63
Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- gnatbuild.eclass 15 Oct 2014 09:52:21 -0000 1.62
+++ gnatbuild.eclass 17 Oct 2014 13:17:30 -0000 1.63
@@ -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/gnatbuild.eclass,v 1.62 2014/10/15 09:52:21 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.63 2014/10/17 13:17:30 george Exp $
#
# Authors: George Shapovalov <george@gentoo.org>
# Steve Arnold <nerdboy@gentoo.org>
@@ -309,6 +309,7 @@
elog
. ${GnatCommon} || die "failed to source common code"
if [[ ! -f ${PRIMELIST} ]] || [[ ! -s ${PRIMELIST} ]]; then
+ mkdir -p ${SETTINGSDIR}
echo "${gnat_profile}" > ${PRIMELIST}
elog "The list of primary compilers was empty and got assigned ${gnat_profile}."
fi
^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2014-10-17 13:17 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-02 17:38 [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass George Shapovalov (george)
-- strict thread matches above, loose matches on Subject: below --
2014-10-17 13:17 George Shapovalov (george)
2014-10-15 9:52 Steve Arnold (nerdboy)
2013-11-14 6:20 Steve Arnold (nerdboy)
2011-05-23 14:09 George Shapovalov (george)
2011-03-10 19:36 George Shapovalov (george)
2010-01-22 13:27 George Shapovalov (george)
2010-01-21 11:05 George Shapovalov (george)
2009-08-30 9:09 George Shapovalov (george)
2009-04-25 10:46 George Shapovalov (george)
2009-02-03 13:58 George Shapovalov (george)
2008-12-08 13:29 George Shapovalov (george)
2008-12-05 8:36 George Shapovalov (george)
2008-11-29 0:46 George Shapovalov (george)
2008-08-19 11:39 George Shapovalov (george)
2008-08-12 9:26 George Shapovalov (george)
2008-07-06 13:00 George Shapovalov (george)
2008-04-14 14:54 George Shapovalov (george)
2008-04-12 7:47 George Shapovalov (george)
2008-02-13 20:12 George Shapovalov (george)
2008-02-11 15:12 George Shapovalov (george)
2007-12-27 8:51 George Shapovalov (george)
2007-10-10 18:17 George Shapovalov (george)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox