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.

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

update sigcpp from 2.6.2 to 3.0.7 #7441

Merged
merged 4 commits into from
Dec 13, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
4 changes: 2 additions & 2 deletions scram-tools.file/tools/sigcpp/sigcpp.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<tool name="sigcpp" version="@TOOL_VERSION@">
<lib name="sigc-2.0"/>
<lib name="sigc-3.0"/>
<client>
<environment name="SIGCPP_BASE" default="@TOOL_ROOT@"/>
<environment name="LIBDIR" default="$SIGCPP_BASE/lib"/>
<environment name="INCLUDE" default="$SIGCPP_BASE/include/sigc++-2.0"/>
<environment name="INCLUDE" default="$SIGCPP_BASE/include/sigc++-3.0"/>
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<use name="root_cxxdefaults"/>
Expand Down
19 changes: 11 additions & 8 deletions sigcpp.spec
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
### RPM external sigcpp 2.6.2
%define majorv %(echo %{realversion} | cut -d. -f1,2)
Source: http://ftp.gnome.org/pub/GNOME/sources/libsigc++/%{majorv}/libsigc++-%{realversion}.tar.xz
### RPM external sigcpp 3.0.7
Source: https://github.com/libsigcplusplus/libsigcplusplus/archive/refs/tags/%{realversion}.tar.gz

BuildRequires: autotools
BuildRequires: cmake

%prep
%setup -q -n libsigc++-%{realversion}
./configure --prefix=%{i} --disable-static
%setup -q -n libsigcplusplus-%{realversion}

%build
rm -rf ../build ; mkdir ../build ; cd ../build
cmake ../libsigcplusplus-%{realversion} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX="%{i}"
make %{makeprocesses}

%install
cd ../build
make install
# We remove pkg-config files for two reasons:
# * it's actually not required (macosx does not even have it).
# * rpm 4.8 adds a dependency on the system /usr/bin/pkg-config
# * rpm 4.8 adds a dependency on the system /usr/bin/pkg-config
# on linux.
# In the case at some point we build a package that can be build
# only via pkg-config we have to think on how to ship our own
# version.
rm -rf %{i}/lib/pkgconfig
# Read documentation online.
%define drop_files %{i}/share
cp %{i}/lib/sigc++-2.0/include/sigc++config.h %{i}/include/sigc++-2.0/
cp %{i}/lib/sigc++-3.0/include/sigc++config.h %{i}/include/sigc++-3.0/