summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFran├žois Andriot <albator78@libertysurf.fr>2019-01-01 22:54:59 +0100
committerFran├žois Andriot <albator78@libertysurf.fr>2019-01-01 23:00:28 +0100
commit6819c09a968cd192664cba895648c1c495eb2995 (patch)
tree2e4ff4fcd7940ba07d3345ba59bb3c47b8f25107
parent0a2cd2900b239c22e45694c23678add0ddbbb539 (diff)
downloadtde-packaging-6819c09a968cd192664cba895648c1c495eb2995.tar.gz
tde-packaging-6819c09a968cd192664cba895648c1c495eb2995.zip
RPM: switch kpicosim to cmake
-rw-r--r--redhat/applications/kpicosim/kpicosim.spec (renamed from redhat/applications/kpicosim/kpicosim-14.0.0.spec)56
1 files changed, 31 insertions, 25 deletions
diff --git a/redhat/applications/kpicosim/kpicosim-14.0.0.spec b/redhat/applications/kpicosim/kpicosim.spec
index deac7442b..a1623f95b 100644
--- a/redhat/applications/kpicosim/kpicosim-14.0.0.spec
+++ b/redhat/applications/kpicosim/kpicosim.spec
@@ -61,11 +61,20 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: autoconf automake libtool m4
+BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: fdupes
+# IDN support
+BuildRequires: libidn-devel
+
+# ACL support
+BuildRequires: libacl-devel
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
@@ -78,7 +87,7 @@ BuildRequires: brp-check-trinity
%description
-kpicosim is a development environment for the Xilinx
+kpicosim is a development environment for the Xilinx
PicoBlaze-3 soft-core processor for the TDE Desktop (Linux).
The environment has an editor with syntax highlighting, compiler,
simulator and export functions to VHDL, HEX and MEM files.
@@ -96,41 +105,37 @@ simulator and export functions to VHDL, HEX and MEM files.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-# Warning: --enable-final causes FTBFS
-%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --bindir=%{tde_bindir} \
- --datadir=%{tde_datadir} \
- --libdir=%{tde_libdir} \
- --mandir=%{tde_mandir} \
- --includedir=%{tde_tdeincludedir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
+
+%cmake \
+ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+ -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DWITH_GCC_VISIBILITY=OFF \
\
- --disable-dependency-tracking \
- --disable-debug \
- --enable-new-ldflags \
- --disable-final \
- --enable-closure \
- --enable-rpath \
- --disable-gcc-hidden-visibility
-
-# SMP safe !
+ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ -DBUILD_ALL=ON \
+ ..
+
%__make %{?_smp_mflags}
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
%clean
@@ -146,6 +151,7 @@ export PATH="%{tde_bindir}:${PATH}"
%{tde_datadir}/apps/kpicosim
%{tde_tdedocdir}/HTML/en/kpicosim
%{tde_datadir}/icons/hicolor/*/apps/kpicosim.png
+%{tde_mandir}/man*/kpicosim.*
%changelog