rpms/redhat-rpm-config
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Allow opting out of config.{guess,sub} replacement hack (#991613)

Browse Source
This commit is contained in:
Panu Matilainen 2014-04-08 13:30:58 +03:00
parent 0f965fc0b3
commit 43629272a8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
macros
View File

@ -29,6 +29,7 @@
#============================================================================== #==============================================================================
# ---- configure and makeinstall. # ---- configure and makeinstall.
# #
%_configure_gnuconfig_hack 1
%_configure_libtool_hardening_hack 1 %_configure_libtool_hardening_hack 1
%_configure ./configure %_configure ./configure
%configure \ %configure \
@ -37,7 +38,7 @@
FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \ FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
FCFLAGS="${FCFLAGS:-%optflags -I%_fmoddir}" ; export FCFLAGS ; \ FCFLAGS="${FCFLAGS:-%optflags -I%_fmoddir}" ; export FCFLAGS ; \
LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS; \ LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS; \
for i in $(find . -name config.guess -o -name config.sub) ; do \ [ "%_configure_gnuconfig_hack" = 1 ] && for i in $(find . -name config.guess -o -name config.sub) ; do \
[ -f /usr/lib/rpm/redhat/$(basename $i) ] && %{__rm} -f $i && %{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i ; \ [ -f /usr/lib/rpm/redhat/$(basename $i) ] && %{__rm} -f $i && %{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i ; \
done ; \ done ; \
[ "%_configure_libtool_hardening_hack" = 1 ] && [ x != "x%{_hardened_ldflags}" ] && \ [ "%_configure_libtool_hardening_hack" = 1 ] && [ x != "x%{_hardened_ldflags}" ] && \

1
redhat-rpm-config.spec
View File

@ -141,6 +141,7 @@ install -p -m 644 -t %{buildroot}%{_rpmconfigdir}/macros.d macros.*
%changelog %changelog
* Tue Apr 08 2014 Panu Matilainen <pmatilai@redhat.com> - 14-1 * Tue Apr 08 2014 Panu Matilainen <pmatilai@redhat.com> - 14-1
- Add Mono path macros (#1070936) - Add Mono path macros (#1070936)
- Allow opting out of config.{guess,sub} replacement hack (#991613)
* Tue Apr 08 2014 Panu Matilainen <pmatilai@redhat.com> - 13-1 * Tue Apr 08 2014 Panu Matilainen <pmatilai@redhat.com> - 13-1
- Move the remaining dependency generator stuff to the kmp macro package - Move the remaining dependency generator stuff to the kmp macro package