diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2018-10-12 12:58:53 +0200 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2018-10-12 13:43:05 +0200 |
| commit | 2ae325759073dc1375687e7834c7d199dfacf463 (patch) | |
| tree | 2c8af6bb8e8a3b9e2bda81d80e94e150910027f1 | |
| parent | 46bad478d927f57000b78c9fee2008f9679ca19c (diff) | |
| download | scl-autotools-2ae325759073dc1375687e7834c7d199dfacf463.tar.gz scl-autotools-2ae325759073dc1375687e7834c7d199dfacf463.tar.xz scl-autotools-2ae325759073dc1375687e7834c7d199dfacf463.zip | |
autotools-latest-libtool: fix hardening hacks
%_hardening_ldflags is not defined in older chroots
| -rw-r--r-- | repos/autotools/autotools-latest/libtool/libtool.spec | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/repos/autotools/autotools-latest/libtool/libtool.spec b/repos/autotools/autotools-latest/libtool/libtool.spec index 4bde829..b7e5b62 100644 --- a/repos/autotools/autotools-latest/libtool/libtool.spec +++ b/repos/autotools/autotools-latest/libtool/libtool.spec @@ -5,13 +5,13 @@ %{?scl:%global __provides_exclude ^libltdl\\.so.*$} %if 0%{?scl:1} +%global gcc_major %(scl enable %scl 'gcc -dumpversion' || echo 666) +%global automake_version %(scl enable %scl 'set -- `automake --version` ; echo ${4-unknown}' || echo 666) +%else # See the bug #429880 %global gcc_major %(gcc -dumpversion || echo "666") # See rhbz#1193591 %global automake_version %(set -- `automake --version | head -n 1` ; echo ${4-unknown}) -%else -%global gcc_major %(scl enable %scl 'gcc -dumpversion' || echo 666) -%global automake_version %(scl enable %scl 'set -- `automake --version` ; echo ${4-unknown}' || echo 666) %endif %{?scl:%scl_package libtool} @@ -21,7 +21,7 @@ Summary: The GNU Portable Library Tool Name: %{?scl_prefix}libtool Version: 2.4.6 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ and LGPLv2+ and GFDL URL: http://www.gnu.org/software/libtool/ Group: Development/Tools @@ -165,8 +165,8 @@ export CFLAGS="$RPM_OPT_FLAGS -fPIC" --infodir=%{_infodir} %make_build \ - CUSTOM_LTDL_CFLAGS="%_hardening_cflags" \ - CUSTOM_LTDL_LDFLAGS="%_hardening_ldflags" + CUSTOM_LTDL_CFLAGS="%{?_hardening_cflags}" \ + CUSTOM_LTDL_LDFLAGS="%{?_hardening_ldflags}" %{?scl_disable} @@ -233,6 +233,9 @@ fi %changelog +* Fri Oct 12 2018 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-9 +- fix build for epel6, fix automake requires + * Fri Oct 12 2018 Pavel Raiskup <praiskup@redhat.com> - 2.4.6-8 - sync with fedora |