!17 Fix build error

From: @jxy_git 
Reviewed-by: @crrs666 
Signed-off-by: @crrs666
This commit is contained in:
openeuler-ci-bot 2024-12-20 08:05:04 +00:00 committed by Gitee
commit 8596a367fe
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -1,7 +1,7 @@
Name: highlight Name: highlight
Summary: Universal source code to formatted text converter Summary: Universal source code to formatted text converter
Version: 3.42 Version: 3.42
Release: 1 Release: 2
Group: Development/Tools Group: Development/Tools
License: GPLv3 License: GPLv3
@ -12,6 +12,7 @@ Patch01: highlight-3.42-list-available-langs.patch
BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-devel
BuildRequires: lua-devel, boost-devel BuildRequires: lua-devel, boost-devel
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: gcc-c++ make
%{?filter_setup: %{?filter_setup:
%filter_from_provides /^perl(/d; %filter_from_provides /^perl(/d;
@ -45,20 +46,21 @@ LDFLAGS="$LDFLAGS %{?__global_ldflags}"; export LDFLAGS
# Disable paralell builds, atempt to fixes FTBFS # Disable paralell builds, atempt to fixes FTBFS
#%make_build all gui %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ #%make_build all gui %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
%make_build all gui CFLAGS="${CFLAGS}" \ %{__make} all gui CFLAGS="${CFLAGS}" \
CXXFLAGS="${CXXFLAGS}" \ CXXFLAGS="${CXXFLAGS}" \
LDFLAGS="${LDFLAGS}" \ LDFLAGS="${LDFLAGS}" \
LFLAGS="-Wl,-O1 ${LDFLAGS}" \ LFLAGS="-Wl,-O1 ${LDFLAGS}" \
PREFIX="%{_prefix}" \
conf_dir="%{_sysconfdir}/highlight/" \
QMAKE="%{_qt5_qmake}" \ QMAKE="%{_qt5_qmake}" \
QMAKE_STRIP= QMAKE_STRIP=
%install %install
%make_install %make_install PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/highlight/"
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
make install-gui DESTDIR=$RPM_BUILD_ROOT PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/highlight/"
make install-gui DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/
@ -82,5 +84,8 @@ desktop-file-install \
%{_datadir}/pixmaps/highlight.xpm %{_datadir}/pixmaps/highlight.xpm
%changelog %changelog
* Fri Dec 20 2024 jiangxinyu <jiangxinyu@kylinos.cn> - 3.42-2
- Fix build error
* Tue Aug 17 2021 Python_Bot <Python_Bot@openeuler.org> - 3.42-1 * Tue Aug 17 2021 Python_Bot <Python_Bot@openeuler.org> - 3.42-1
- Init Package - Init Package