mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
sys-cluster/torque: fix build issues with newer toolchains
Backported upstream patch for 6.1.3 codebase to fix "gcc-7 errors", which resolves build errors from using C++ standards newer than 03. Also removed unpatch torque-6.0.4 ebuild as it no longer builds Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
This commit is contained in:
Ian Stakenvicius
@@ -19,3 +19,52 @@
|
||||
while ((current != NULL) &&
|
||||
(*current != '\0'))
|
||||
{
|
||||
--- a/src/cmds/qsub_functions.c 2017-01-24 18:35:27.000000000 -0500
|
||||
+++ b/src/cmds/qsub_functions.c 2017-11-21 13:40:27.201964749 -0500
|
||||
@@ -900,7 +900,7 @@
|
||||
else
|
||||
{
|
||||
char *tmp_host = pbs_default();
|
||||
- if (tmp_host == '\0')
|
||||
+ if (*tmp_host == '\0')
|
||||
hash_add_or_exit(job_attr, ATTR_pbs_o_server, qsub_host, LOGIC_DATA);
|
||||
else
|
||||
hash_add_or_exit(job_attr, ATTR_pbs_o_server, tmp_host, LOGIC_DATA);
|
||||
--- a/src/cmds/pbsnodes.c 2017-01-24 18:35:27.000000000 -0500
|
||||
+++ b/src/cmds/pbsnodes.c 2017-11-21 13:40:27.201964749 -0500
|
||||
@@ -900,7 +900,7 @@
|
||||
{
|
||||
nodeargs = (char **)calloc(2, sizeof(char *));
|
||||
nodeargs[0] = strdup("");
|
||||
- nodeargs[1] = '\0';
|
||||
+ nodeargs[1] = NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1020,7 +1020,7 @@
|
||||
|
||||
MXMLCreateE(&DE, "Data");
|
||||
|
||||
- for (lindex = 0;nodeargs[lindex] != '\0';lindex++)
|
||||
+ for (lindex = 0;nodeargs[lindex] != NULL;lindex++)
|
||||
{
|
||||
bstatus = statnode(con, nodeargs[lindex]);
|
||||
|
||||
@@ -1041,7 +1041,7 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
- for (lindex = 0;nodeargs[lindex] != '\0';lindex++)
|
||||
+ for (lindex = 0;nodeargs[lindex] != NULL;lindex++)
|
||||
{
|
||||
bstatus = statnode(con, nodeargs[lindex]);
|
||||
|
||||
@@ -1065,7 +1065,7 @@
|
||||
|
||||
/* list any node that is DOWN, OFFLINE, or UNKNOWN */
|
||||
|
||||
- for (lindex = 0;nodeargs[lindex] != '\0';lindex++)
|
||||
+ for (lindex = 0;nodeargs[lindex] != NULL;lindex++)
|
||||
{
|
||||
bstatus = statnode(con, nodeargs[lindex]);
|
||||
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/src/daemon_client/trq_auth_daemon.c 2017-08-29 18:25:11.000000000 -0400
|
||||
+++ b/src/daemon_client/trq_auth_daemon.c 2019-10-21 13:58:47.441212099 -0400
|
||||
@@ -134,7 +134,7 @@
|
||||
{
|
||||
openlog("daemonize_trqauthd", LOG_PID | LOG_NOWAIT, LOG_DAEMON);
|
||||
syslog(LOG_ALERT, "Failed to create client_logs directory: %s errno: %d error message: %s", path_log, errno, strerror(errno));
|
||||
- sprintf(error_buf,"Failed to create client_logs directory: %s, error message: %s",path_log,strerror(errno));
|
||||
+ snprintf(error_buf,sizeof(error_buf),"Failed to create client_logs directory: %s, error message: %s",path_log,strerror(errno));
|
||||
log_err(errno,__func__,error_buf);
|
||||
closelog();
|
||||
return(PBSE_SYSTEM);
|
||||
1606
sys-cluster/torque/files/torque-6.0.4-gcc7.patch
Normal file
1606
sys-cluster/torque/files/torque-6.0.4-gcc7.patch
Normal file
File diff suppressed because it is too large
Load Diff
@@ -47,8 +47,10 @@ RDEPEND="${DEPEND_COMMON}
|
||||
S="${WORKDIR}"/${PN}-6a0b37f85c7d644e9217cbab1542792d646f59a6
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-gcc7.patch
|
||||
"${FILESDIR}"/${PN}-6.0.3-fix-emptystring-comparison.patch
|
||||
"${FILESDIR}"/${P}-no-openssl.patch
|
||||
"${FILESDIR}"/${P}-error_buf_overflow_prevent.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
@@ -92,8 +94,6 @@ src_prepare() {
|
||||
|
||||
src_configure() {
|
||||
append-cflags "-fpermissive"
|
||||
use kernel_linux && append-cflags "-Dlinux"
|
||||
append-cxxflags "-std=c++03"
|
||||
|
||||
econf \
|
||||
$(use_enable tk gui) \
|
||||
|
||||
@@ -1,177 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools flag-o-matic linux-info
|
||||
|
||||
DESCRIPTION="Resource manager and queuing system based on OpenPBS"
|
||||
HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
|
||||
SRC_URI="https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> ${P}-gh-20170829.tar.gz"
|
||||
|
||||
LICENSE="torque-2.5"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="autorun cgroups cpusets +crypt doc drmaa kernel_linux libressl munge nvidia quickcommit server +syslog tk"
|
||||
|
||||
DEPEND_COMMON="
|
||||
sys-libs/zlib
|
||||
sys-libs/readline:0=
|
||||
dev-libs/libxml2
|
||||
>=dev-libs/boost-1.41
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
cpusets? ( sys-apps/hwloc )
|
||||
munge? ( sys-auth/munge )
|
||||
nvidia? ( >=x11-drivers/nvidia-drivers-275 )
|
||||
tk? (
|
||||
dev-lang/tk:0=
|
||||
dev-lang/tcl:0=
|
||||
)
|
||||
syslog? ( virtual/logger )
|
||||
!!games-util/qstat"
|
||||
|
||||
# libncurses.so is only needed for configure check on readline
|
||||
DEPEND="${DEPEND_COMMON}
|
||||
sys-libs/ncurses:*
|
||||
!!sys-cluster/slurm"
|
||||
|
||||
RDEPEND="${DEPEND_COMMON}
|
||||
crypt? ( net-misc/openssh )
|
||||
!crypt? ( net-misc/netkit-rsh )
|
||||
!dev-libs/uthash"
|
||||
|
||||
# Torque should depend on dev-libs/uthash but that's pretty much impossible
|
||||
# to patch in as they ship with a broken configure such that files referenced
|
||||
# by the configure.ac and Makefile.am are missing.
|
||||
# http://www.supercluster.org/pipermail/torquedev/2014-October/004773.html
|
||||
|
||||
S="${WORKDIR}"/${PN}-6a0b37f85c7d644e9217cbab1542792d646f59a6
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-6.0.3-fix-emptystring-comparison.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
PBS_SERVER_HOME="${PBS_SERVER_HOME:-/var/spool/${PN}}"
|
||||
|
||||
# Find a Torque server to use. Check environment, then
|
||||
# current setup (if any), and fall back on current hostname.
|
||||
if [ -z "${PBS_SERVER_NAME}" ]; then
|
||||
if [ -f "${ROOT}${PBS_SERVER_HOME}/server_name" ]; then
|
||||
PBS_SERVER_NAME="$(<${ROOT}${PBS_SERVER_HOME}/server_name)"
|
||||
else
|
||||
PBS_SERVER_NAME=$(hostname -f)
|
||||
fi
|
||||
fi
|
||||
|
||||
if use cpusets || use cgroups; then
|
||||
if ! use kernel_linux; then
|
||||
einfo
|
||||
elog " Torque currently only has support for cpusets and cgroups in linux."
|
||||
elog "Assuming you didn't really want this USE flag and ignoring its state."
|
||||
einfo
|
||||
else
|
||||
linux-info_pkg_setup
|
||||
if ! linux_config_exists || ! linux_chkconfig_present CPUSETS; then
|
||||
einfo
|
||||
elog " Torque support for cpusets will require that you recompile"
|
||||
elog "your kernel with CONFIG_CPUSETS enabled."
|
||||
einfo
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
# We install to a valid location, no need to muck with ld.so.conf
|
||||
# --without-loadlibfile is supposed to do this for us...
|
||||
sed -i '/mk_default_ld_lib_file || return 1/d' buildutils/pbs_mkdirs.in || die
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable tk gui) \
|
||||
$(use_enable tk tcl-qstat) \
|
||||
$(use_enable syslog) \
|
||||
$(use_enable server) \
|
||||
$(use_enable drmaa) \
|
||||
$(use_enable munge munge-auth) \
|
||||
$(use_enable nvidia nvidia-gpus) \
|
||||
$(usex crypt "--with-rcp=scp" "--with-rcp=mom_rcp") \
|
||||
$(usex kernel_linux $(use_enable cpusets cpuset) --disable-cpuset) \
|
||||
$(usex kernel_linux $(use_enable cpusets geometry-request) --disable-geometry-request) \
|
||||
$(usex kernel_linux $(use_enable cgroups) --disable-cgroups) \
|
||||
$(use_enable autorun) \
|
||||
$(use_enable quickcommit) \
|
||||
--with-server-home=${PBS_SERVER_HOME} \
|
||||
--with-environ=/etc/pbs_environment \
|
||||
--with-default-server=${PBS_SERVER_NAME} \
|
||||
--disable-gcc-warnings \
|
||||
--disable-silent-rules \
|
||||
--with-tcp-retry-limit=2 \
|
||||
--without-loadlibfile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local dir
|
||||
|
||||
DOCS=( CHANGELOG README.* Release_Notes )
|
||||
use doc && DOCS+=( doc/admin_guide.ps doc/*.pdf )
|
||||
|
||||
default
|
||||
|
||||
# The build script isn't alternative install location friendly,
|
||||
# So we have to fix some hard-coded paths in tclIndex for xpbs* to work
|
||||
for file in $(find "${ED}" -iname tclIndex); do
|
||||
sed \
|
||||
-e "s/${ED//\// }/ /" \
|
||||
-i "${file}" || die
|
||||
done
|
||||
|
||||
for dir in $(find "${ED}/${PBS_SERVER_HOME}" -type d); do
|
||||
keepdir "${dir#${ED}}"
|
||||
done
|
||||
|
||||
if use server; then
|
||||
newinitd "${FILESDIR}"/pbs_server-init.d-munge pbs_server
|
||||
newinitd "${FILESDIR}"/pbs_sched-init.d pbs_sched
|
||||
fi
|
||||
newinitd "${FILESDIR}"/pbs_mom-init.d-munge pbs_mom
|
||||
newconfd "${FILESDIR}"/${PN}-conf.d-munge ${PN}
|
||||
newinitd "${FILESDIR}"/trqauthd-init.d trqauthd
|
||||
newenvd "${FILESDIR}"/${PN}-env.d 25${PN}
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
if [[ -f "${ROOT}etc/pbs_environment" ]]; then
|
||||
cp "${ROOT}etc/pbs_environment" "${ED}"/etc/pbs_environment || die
|
||||
fi
|
||||
|
||||
if use server && [[ -f "${ROOT}${PBS_SERVER_HOME}/server_priv/nodes" ]]; then
|
||||
cp \
|
||||
"${EROOT}${PBS_SERVER_HOME}/server_priv/nodes" \
|
||||
"${ED}/${PBS_SERVER_HOME}/server_priv/nodes" || die
|
||||
fi
|
||||
|
||||
echo "${PBS_SERVER_NAME}" > "${ED}${PBS_SERVER_HOME}/server_name" || die
|
||||
|
||||
# Fix up the env.d file to use our set server home.
|
||||
sed \
|
||||
-e "s:/var/spool/${PN}:${PBS_SERVER_HOME}:g" \
|
||||
-i "${ED}"/etc/env.d/25${PN} || die
|
||||
|
||||
if use munge; then
|
||||
sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${ED}"/etc/conf.d/${PN} || die
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ -z "${REPLACING_VERSIONS}" ]] ; then
|
||||
elog "If this is the first time torque has been installed, then you are not"
|
||||
elog "ready to start the server. Please refer to the documentation located at:"
|
||||
elog "http://docs.adaptivecomputing.com/torque/${PN//./-}/adminGuide/help.htm#topics/torque/1-installConfig/initializeConfigOnServer.htm"
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user