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

Revert "Update yaml-cpp to 0.7.0" #7787

Merged
merged 1 commit into from
Apr 14, 2022
Merged

Revert "Update yaml-cpp to 0.7.0" #7787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion scram-tools.file/tools/yaml-cpp/yaml-cpp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<lib name="yaml-cpp"/>
<client>
<environment name="YAML_CPP_BASE" default="@TOOL_ROOT@"/>
<environment name="LIBDIR" default="$YAML_CPP_BASE/lib64"/>
<environment name="LIBDIR" default="$YAML_CPP_BASE/lib"/>
<environment name="INCLUDE" default="$YAML_CPP_BASE/include"/>
</client>
<use name="boost"/>
Expand Down
14 changes: 11 additions & 3 deletions yaml-cpp.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
### RPM external yaml-cpp 0.7.0
### RPM external yaml-cpp 0.6.2
Source: https://github.com/jbeder/yaml-cpp/archive/%{n}-%{realversion}.tar.gz

BuildRequires: cmake

Requires: boost

%prep
%setup -n %{n}-%{n}-%{realversion}

%build
cmake . \
-DCMAKE_INSTALL_PREFIX:PATH="%{i}" \
-DBUILD_SHARED_LIBS=YES
-DBUILD_SHARED_LIBS=YES \
-DBoost_NO_SYSTEM_PATHS:BOOL=TRUE \
-DBoost_NO_BOOST_CMAKE:BOOL=TRUE \
-DBoost_ADDITIONAL_VERSIONS="1.57.0" \
-DBOOST_ROOT:PATH=${BOOST_ROOT} \
-DCMAKE_SKIP_RPATH=YES \
-DSKIP_INSTALL_FILES=1

make %{makeprocesses} VERBOSE=1

Expand Down