- attempt to fix and respect build flags rhbz #1563149

This commit is contained in:
Filipe Rosset 2018-09-20 16:04:40 -03:00
parent 5c7e7dab0b
commit 0c48abddda

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.44 Version: 3.44
Release: 1%{?dist} Release: 2%{?dist}
Group: Development/Tools Group: Development/Tools
License: GPLv3 License: GPLv3
@ -39,18 +39,26 @@ A Qt-based GUI for the highlight source code formatter source.
%autosetup %autosetup
%build %build
CFLAGS="%{optflags}"; export CFLAGS #CFLAGS="%{optflags}"; export CFLAGS
CXXFLAGS="%{optflags}"; export CXXFLAGS #CXXFLAGS="%{optflags}"; export CXXFLAGS
LDFLAGS="%{?__global_ldflags}"; export LDFLAGS #LDFLAGS="%{?__global_ldflags}"; export LDFLAGS
CFLAGS="$CFLAGS -fPIC %{optflags}"; export CFLAGS
CXXFLAGS="$CXXFLAGS -fPIC %{optflags}"; export CXXFLAGS
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="$RPM_OPT_FLAGS" \ #make_build all gui CFLAGS="$RPM_OPT_FLAGS" \
LDFLAGS="%{?__global_ldflags}" \ # LDFLAGS="%{?__global_ldflags}" \
# QMAKE="%{_qt5_qmake}" \
# QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
# QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
# QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \
%make_build all gui CFLAGS="${CFLAGS}" \
CXXFLAGS="${CXXFLAGS}" \
LDFLAGS="${LDFLAGS}" \
LFLAGS="-Wl,-O1 ${LDFLAGS}" \
QMAKE="%{_qt5_qmake}" \ QMAKE="%{_qt5_qmake}" \
QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \
QMAKE_STRIP= QMAKE_STRIP=
%install %install
@ -83,6 +91,9 @@ desktop-file-install \
%{_datadir}/pixmaps/highlight.xpm %{_datadir}/pixmaps/highlight.xpm
%changelog %changelog
* Thu Sep 20 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.44-2
- attempt to fix and respect build flags rhbz #1563149
* Sat Sep 15 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.44-1 * Sat Sep 15 2018 Filipe Rosset <rosset.filipe@gmail.com> - 3.44-1
- Updated to new 3.44 upstream version - Updated to new 3.44 upstream version