Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build from source rather than from release #14

Closed
wants to merge 4 commits into from
Closed

Build from source rather than from release #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe435f4
Build from source rather than from release
jan-janssen Apr 24, 2023
a48f24d
Update meta.yaml
jan-janssen Apr 24, 2023
5a3eda2
Update centos6.patch
jan-janssen Apr 25, 2023
02c8482
Update meta.yaml
jan-janssen Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
165 changes: 0 additions & 165 deletions recipe/LICENSE
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash
# Build
export CPPFLAGS="-D_FORTIFY_SOURCE=2 -O2 -isystem $PREFIX/include"
./autogen.sh
./configure --prefix=${PREFIX}
make

Expand Down
63 changes: 32 additions & 31 deletions recipe/centos6.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 @@
Expand Down Expand Up @@ -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)
12 changes: 9 additions & 3 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,31 @@ 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:
- {{ compiler('c') }}
- make
- pkgconfig
- jq
- libtool
- m4
- autoconf
- automake
host:
- python
- zeromq
Expand Down