diff --git a/recipe/LICENSE b/recipe/LICENSE deleted file mode 100644 index 0a04128..0000000 --- a/recipe/LICENSE +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/recipe/build.sh b/recipe/build.sh index ec3c4ab..38378d7 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -1,6 +1,7 @@ #!/bin/bash # Build export CPPFLAGS="-D_FORTIFY_SOURCE=2 -O2 -isystem $PREFIX/include" +./autogen.sh ./configure --prefix=${PREFIX} make diff --git a/recipe/centos6.patch b/recipe/centos6.patch index 21348c5..0ab2b31 100644 --- a/recipe/centos6.patch +++ b/recipe/centos6.patch @@ -270,18 +270,6 @@ index b4a17c3ea..55fd57ffd 100644 fprintf (fstream, "EOF\n"); } -diff -Nur flux-core-0.49.0/src/common/libeventlog/Makefile.in flux-core-0.49.0.new/src/common/libeventlog/Makefile.in ---- flux-core-0.49.0/src/common/libeventlog/Makefile.in 2023-04-05 16:24:09.982692163 +0000 -+++ flux-core-0.49.0.new/src/common/libeventlog/Makefile.in 2023-04-12 03:49:02.262611471 +0000 -@@ -691,7 +691,7 @@ - $(top_builddir)/src/common/libtap/libtap.la \ - $(top_builddir)/src/common/libeventlog/libeventlog.la \ - $(top_builddir)/src/common/libutil/libutil.la \ -- $(JANSSON_LIBS) -+ $(JANSSON_LIBS) -lrt - - all: all-am - diff --git a/src/modules/resource/exclude.c b/src/modules/resource/exclude.c index 62326abf6..ea0f46581 100644 --- a/src/modules/resource/exclude.c @@ -301,25 +289,6 @@ index 62326abf6..ea0f46581 100644 idset_destroy (add); } if (del) { -diff -Nur flux-core-0.49.0/src/shell/Makefile.in flux-core-0.49.0.new/src/shell/Makefile.in ---- flux-core-0.49.0/src/shell/Makefile.in 2023-04-05 16:24:12.798689648 +0000 -+++ flux-core-0.49.0.new/src/shell/Makefile.in 2023-04-12 02:50:11.579942667 +0000 -@@ -872,13 +872,14 @@ - $(top_builddir)/src/bindings/lua/libfluxlua.la \ - $(top_builddir)/src/common/libflux-core.la \ - $(top_builddir)/src/common/libflux-taskmap.la \ -+ $(top_builddir)/src/common/libflux-idset.la \ - $(top_builddir)/src/common/libpmi/libpmi_server.la \ - $(top_builddir)/src/common/libpmi/libpmi_common.la \ - $(top_builddir)/src/common/libczmqcontainers/libczmqcontainers.la \ -- $(top_builddir)/src/common/libflux-internal.la \ - $(top_builddir)/src/common/libflux-optparse.la \ - $(top_builddir)/src/common/libterminus/libterminus.la \ - $(top_builddir)/src/common/libutil/libutil.la \ -+ $(top_builddir)/src/common/libflux-internal.la \ - $(LUA_LIB) \ - $(HWLOC_LIBS) \ - $(JANSSON_LIBS) \ --- a/t/t0001-basic.t 2023-04-05 16:22:48.910745814 +0000 +++ b/t/t0001-basic.t 2023-04-13 13:45:26.201487673 +0000 @@ -613,7 +613,8 @@ @@ -362,3 +331,35 @@ index 84b02f97f..fd9387ed5 100644 export PATH if ! test -x ${fluxbin}; then + +diff --git a/src/shell/Makefile.am b/src/shell/Makefile.am +index 51463f78d..077030db5 100644 +--- a/src/shell/Makefile.am ++++ b/src/shell/Makefile.am +@@ -99,13 +99,14 @@ flux_shell_LDADD = \ + $(top_builddir)/src/bindings/lua/libfluxlua.la \ + $(top_builddir)/src/common/libflux-core.la \ + $(top_builddir)/src/common/libflux-taskmap.la \ ++ $(top_builddir)/src/common/libflux-idset.la \ + $(top_builddir)/src/common/libpmi/libpmi_server.la \ + $(top_builddir)/src/common/libpmi/libpmi_common.la \ + $(top_builddir)/src/common/libczmqcontainers/libczmqcontainers.la \ +- $(top_builddir)/src/common/libflux-internal.la \ + $(top_builddir)/src/common/libflux-optparse.la \ + $(top_builddir)/src/common/libterminus/libterminus.la \ + $(top_builddir)/src/common/libutil/libutil.la \ ++ $(top_builddir)/src/common/libflux-internal.la \ + $(LUA_LIB) \ + $(HWLOC_LIBS) \ + $(JANSSON_LIBS) \ +diff --git a/src/common/libeventlog/Makefile.am b/src/common/libeventlog/Makefile.am +index fdd2cde56..7430825d3 100644 +--- a/src/common/libeventlog/Makefile.am ++++ b/src/common/libeventlog/Makefile.am +@@ -37,4 +37,5 @@ test_eventlog_t_LDADD = \ + $(top_builddir)/src/common/libtap/libtap.la \ + $(top_builddir)/src/common/libeventlog/libeventlog.la \ + $(top_builddir)/src/common/libutil/libutil.la \ +- $(JANSSON_LIBS) ++ $(JANSSON_LIBS) \ ++ $(LIBRT) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c832de5..8e16977 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -6,18 +6,20 @@ package: version: {{ version }} source: - url: https://github.com/flux-framework/flux-core/releases/download/v{{ version }}/flux-core-{{ version }}.tar.gz - sha256: 9b8d7af1d8aaa7ee110bcb9815b6b8647af686de949097c9bb2a0269d5551051 + url: https://github.com/flux-framework/flux-core/archive/refs/tags/v{{ version }}.tar.gz + sha256: d9ecf562022048a83161b65df07047673626d8ece515546e45a19c269fb17726 patches: # part of the patch is merged in https://github.com/flux-framework/flux-core/pull/5093 # the rest is related to SEEK_DATA not being available in the conda clib. - centos6.patch build: - number: 2 + number: 3 skip: true # [not linux] run_exports: - {{ pin_subpackage('flux-core', max_pin='x.x') }} + script_env: + - FLUX_VERSION={{ version }} requirements: build: @@ -25,6 +27,10 @@ requirements: - make - pkgconfig - jq + - libtool + - m4 + - autoconf + - automake host: - python - zeromq