FreeBSD Bugzilla – Attachment 172365 Details for
Bug 210648
sysutils/slurm-wlm: update 15.06.12 -> 16.05.4 and fix build hangs
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
svn patch to fix issue building docs
slurm-wlm-15.08.12_1.diff (text/plain), 12.42 KB, created by
Joseph Mingrone
on 2016-07-11 04:04:01 UTC
(
hide
)
Description:
svn patch to fix issue building docs
Filename:
MIME Type:
Creator:
Joseph Mingrone
Created:
2016-07-11 04:04:01 UTC
Size:
12.42 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 418351) >+++ Makefile (working copy) >@@ -3,6 +3,7 @@ > > PORTNAME= slurm > PORTVERSION= 15.08.12 >+PORTREVISION= 1 > CATEGORIES= sysutils > MASTER_SITES= http://www.schedmd.com/download/latest/ \ > http://www.schedmd.com/download/archive/ \ >@@ -30,7 +31,10 @@ > USES= gmake libtool pkgconfig python:build tar:bz2 > USE_PERL5= configure > >-OPTIONS_DEFINE= CURL DOCS GTK2 HDF5 HWLOC IPMI MYSQL RRD >+## There is a problem with a python script (man2html.py) that creates the HTML >+## docs, which causes the build to hang. For now, just remove the DOCS option. >+#OPTIONS_DEFINE= CURL DOCS GTK2 HDF5 HWLOC IPMI MYSQL RRD >+OPTIONS_DEFINE= CURL GTK2 HDF5 HWLOC IPMI MYSQL RRD > OPTIONS_DEFAULT=HDF5 HWLOC > OPTIONS_SUB= yes > >@@ -41,13 +45,18 @@ > IPMI_DESC= IPMI engergy consumption accounting > RRD_DESC= RRD external sensor data collection > >-GTK2_USE= GNOME=glib20,gtk20 >+#DOCS_BUILD_DEPENDS= man2html:textproc/man2html >+CONFIGURE_ENV+= ac_have_man2html=no > >-DOCS_BUILD_DEPENDS= man2html:textproc/man2html >- > CURL_LIB_DEPENDS= libcurl.so:ftp/curl > CURL_CONFIGURE_WITH= libcurl > >+GTK2_USE= GNOME=cairo,gdkpixbuf2,glib20,gtk20 >+GTK2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ >+ libfreetype.so:print/freetype2 >+GTK2_USES= gettext >+GTK2_CONFIGURE_ENV_OFF= ac_gtk_test=no >+ > HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 \ > libsz.so:science/szip > HDF5_CONFIGURE_WITH= hdf5 >@@ -58,11 +67,12 @@ > IPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi > IPMI_CONFIGURE_WITH= freeipmi > >+MYSQL_USES= mysql >+MYSQL_CONFIGURE_with= mysql >+ > RRD_LIB_DEPENDS= librrd.so:databases/rrdtool > RRD_CONFIGURE_WITH= rrdtool > >-MYSQL_USE= MYSQL=yes >- > CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include > LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lkvm > >Index: pkg-plist >=================================================================== >--- pkg-plist (revision 418351) >+++ pkg-plist (working copy) >@@ -420,88 +420,19 @@ > sbin/slurmstepd > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/Slurm_Entity.pdf > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/Slurm_Individual.pdf >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/accounting.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/accounting_storageplugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/acct_gather.conf.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/acct_gather_energy_plugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/acct_gather_profile_plugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/add.html > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/allocation_pies.gif >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/api.html > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/arch.gif >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/authplugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bb_plugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/big_sys.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bluegene.conf.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bluegene.html > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bull.jpg >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/burst_buffer.conf.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/burst_buffer.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cgroup.conf.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cgroups.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/checkpoint_blcr.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/checkpoint_plugins.html > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/coding_style.pdf >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/configurator.easy.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/configurator.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cons_res.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cons_res_share.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/contributor.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/core_spec.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/core_spec_plugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cpu_management.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cray.conf.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cray.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cray_alps.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/crypto_plugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/disclaimer.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/dist_plane.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/documentation.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/download.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/elastic_computing.html > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/entities.gif > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/example_usage.gif >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ext_sensors.conf.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ext_sensorsplugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/fair_tree.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/faq.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gang_scheduling.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gres.conf.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gres.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gres_design.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gres_plugins.html > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/hdf5_job_outline.png >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/hdf5_profile_user_guide.html > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/hdf5_task_attr.png >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/high_throughput.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm-pe.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm.html > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm_pe_fig1.png > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm_pe_fig2.png >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_array.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_container_plugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_exit_code.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_launch.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_submit_plugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/jobacct_gatherplugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/jobcompplugins.html > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/k_function.gif >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/launch_plugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/licenses.html > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/linuxstyles.css >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mail.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/man_index.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/maui.html > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mc_support.gif >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mc_support.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/meetings.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/moab.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mpi_guide.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mpiplugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/multi_cluster.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/news.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/nonstop.conf.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/overview.html > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex1.gif > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex2.gif > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex3.gif >@@ -509,84 +440,12 @@ > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex5.gif > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex6.gif > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex7.gif >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/platforms.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/power_mgmt.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/power_plugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/power_save.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/preempt.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/preemption_plugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_multifactor.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_multifactor3.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_plugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/proctrack_plugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/programmer_guide.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/prolog_epilog.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/publications.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/qos.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/quickstart.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/quickstart_admin.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/reservations.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/resource_limits.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/rosetta.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/route_plugin.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/rpc.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sacct.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sacctmgr.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/salloc.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sattach.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sbatch.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sbcast.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/scancel.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sched_config.html > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/schedmd.png >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/schedplugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/scontrol.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sdiag.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/select_design.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/selectplugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sh5util.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sinfo.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm.conf.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm.html > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_design.pdf > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_logo.png >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_ug_agenda.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_ug_cfp.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmctld.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmctld_plugstack.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmd.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmdbd.conf.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmdbd.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmstepd.html > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmstyles.css >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/smap.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/spank.html > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sponsors.gif >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sprio.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/squeue.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sreport.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/srun.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/srun_cr.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sshare.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sstat.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/strigger.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sun_const.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sview.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/switchplugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/taskplugins.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/team.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/testimonials.html > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topo_ex1.gif > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topo_ex2.gif >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topology.conf.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topology.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topology_plugin.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tres.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/troubleshoot.html > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tutorial_intro_files.tar >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tutorials.html > %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/usage_pies.gif >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/user_permissions.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/wckey.html >-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/wiki.conf.html
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=172365">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
jrm
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 210648
:
172365
|
172366
|
174027
|
174029
|
174033
|
174035