Skip to content

Commit

Permalink
Merge pull request #7441 from ddaina/fix_#7440
Browse files Browse the repository at this point in the history
update sigcpp from 2.6.2 to 3.0.7
  • Loading branch information
cmsbuild authored Dec 13, 2021
2 parents 2296596 + 59e422e commit 0ca0430
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
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 gmake

%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/

0 comments on commit 0ca0430

Please sign in to comment.