Skip to content

Update to build with libdaos 1.2.0 #4

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

Open
brianjmurrell wants to merge 2 commits into
base: master
Choose a base branch
from
+10 −3
Open

Update to build with libdaos 1.2.0 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a060cf9
Update to build with libdaos 1.2.0
brianjmurrell Oct 9, 2020
3d6e7f0
DO NOT LAND
brianjmurrell Oct 27, 2020
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
8 changes: 6 additions & 2 deletions hdf5-vol-daos.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%global with_mpich 1
%global with_openmpi3 1

%global daos_major 0
%global daos_major 1

%if %{with_mpich}
%global mpi_list mpich
Expand Down Expand Up @@ -40,7 +40,8 @@ URL: https://portal.hdfgroup.org/display/HDF5/HDF5
Source0: %{source_commit}.tar.gz
Source1: %{test_commit}.tar.gz

BuildRequires: daos-devel%{?_isa}
BuildRequires: daos-devel%{?_isa} = 1.1.1-4.5206.gcf701218%{dist}

BuildRequires: gcc, gcc-c++
%if (0%{?suse_version} >= 1500)
BuildRequires: cmake >= 3.1
Expand Down Expand Up @@ -197,6 +198,9 @@ done
%endif

%changelog
* Fri Oct 9 2020 Brian J. Murrell <brian.murrell@intel.com> - 0.1-3.gb324b90d4
- Rebuild for libdaos 1.2.0

* Mon Oct 5 2020 Brian J. Murrell <brian.murrell@intel.com> - 0.1-2.gb324b90d4
- Tests packages should not require any -devel packages

Expand Down
5 changes: 4 additions & 1 deletion packaging/Makefile_packaging.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ LEAP_15_PR_REPOS ?= $(shell git show -s --format=%B | sed -ne 's/^PR-rep
EL_7_PR_REPOS ?= $(shell git show -s --format=%B | sed -ne 's/^PR-repos-el7: *\(.*\)/\1/p')
UBUNTU_20_04_PR_REPOS ?= $(shell git show -s --format=%B | sed -ne 's/^PR-repos-ubuntu20: *\(.*\)/\1/p')

COMMON_RPM_ARGS := --define "%_topdir $$PWD/_topdir" $(BUILD_DEFINES)
COMMON_RPM_ARGS := --define "_topdir $$PWD/_topdir" $(BUILD_DEFINES)
SPEC := $(shell if [ -f $(NAME)-$(DISTRO_BASE).spec ]; then echo $(NAME)-$(DISTRO_BASE).spec; else echo $(NAME).spec; fi)
VERSION = $(eval VERSION := $(shell rpm $(COMMON_RPM_ARGS) --specfile --qf '%{version}\n' $(SPEC) | sed -n '1p'))$(VERSION)
DEB_RVERS := $(subst $(DOT),\$(DOT),$(VERSION))
Expand Down Expand Up @@ -396,6 +396,9 @@ show_patches:
show_sources:
@echo $(SOURCES)

show_other_sources:
@echo $(OTHER_SOURCES)

show_targets:
@echo $(TARGETS)

Expand Down