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

DAOS-14410 Update to 2.0 #33

Merged
merged 6 commits into from
Oct 3, 2023
Merged

DAOS-14410 Update to 2.0 #33

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9f9408e
DAOS-623 Update to 2.0
janekmi Sep 11, 2023
1b73abb
Expand on changes and how they affect the resulting packaging in chan…
janekmi Sep 20, 2023
3e358c4
Further cleanups
janekmi Sep 21, 2023
7f5d307
Add perl to requirements
janekmi Sep 22, 2023
9c7986f
Restore glibc-devel and introduce make_common_argsb
janekmi Sep 26, 2023
d8796ce
Combine all NDCTL_ENABLE=n appending instances
janekmi Sep 26, 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
21 changes: 8 additions & 13 deletions pmdk.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@
%bcond_without ndctl

%define min_ndctl_ver 60.1
%define make_common_args EXTRA_CFLAGS="-Wno-error" NORPATH=1 BUILD_EXAMPLES=n BUILD_BENCHMARKS=n
%define _make_common_args EXTRA_CFLAGS="-Wno-error" NORPATH=1 BUILD_EXAMPLES=n BUILD_BENCHMARKS=n
%if %{without ndctl}
%define make_common_args %{_make_common_args} NDCTL_ENABLE=n
%else
%define make_common_args %{_make_common_args}
%endif
brianjmurrell marked this conversation as resolved.
Show resolved Hide resolved

Name: pmdk
Version: %{major}.%{minor}.%{bugrelease}%{?prerelease:~%{prerelease}}
Expand Down Expand Up @@ -435,18 +440,12 @@ export LDFLAGS="%{?__global_ldflags}"
%endif
# For debug build default flags may be overridden to disable compiler
# optimizations.
make %{?_smp_mflags} %{make_common_args} \
%if %{without ndctl}
NDCTL_ENABLE=n
%endif
make %{?_smp_mflags} %{make_common_args}


# Override LIB_AR with empty string to skip installation of static libraries
%install
make install DESTDIR=%{buildroot} %{make_common_args} \
%if %{without ndctl}
NDCTL_ENABLE=n \
%endif
LIB_AR= \
prefix=%{_prefix} \
libdir=%{_libdir} \
Expand Down Expand Up @@ -474,11 +473,7 @@ cp utils/pmdk.magic %{buildroot}%{_datadir}/pmdk/
echo 'TEST_BUILD="debug nondebug"' >> src/test/testconfig.sh
echo 'TEST_FS="pmem any none"' >> src/test/testconfig.sh
%endif
make %{make_common_args} \
%if %{without ndctl}
NDCTL_ENABLE=n \
%endif
check
make %{make_common_args} check
%endif

%if 0%{?suse_version} >= 01315
Expand Down