From 2c5594c9af1123f256a0df0744cae5ea73dd9503 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Thu, 4 Jun 2020 03:09:53 +0200 Subject: [PATCH] Fix broken %configure Signed-off-by: Igor Raits --- macros | 5 ++--- redhat-rpm-config.spec | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/macros b/macros index e8384c7..0aa06ec 100644 --- a/macros +++ b/macros @@ -101,8 +101,7 @@ LDFLAGS="${LDFLAGS:-%{build_ldflags}}" ; export LDFLAGS ; \ LT_SYS_LIBRARY_PATH="${LT_SYS_LIBRARY_PATH:-%_libdir:}" ; export LT_SYS_LIBRARY_PATH ; \ CC=%{__cc}; export CC ; \ - CXX=%{__cxx}; export CXX ; \ - %{nil} + CXX=%{__cxx}; export CXX # Internal-only. Do not use. Expand a variable and strip the flags # not suitable to extension builders. @@ -175,7 +174,7 @@ print(result) diff -u $file.backup $file && mv $file.backup $file \ %{__sed} --in-place=.backup 's#^lt_cv_sys_global_symbol_to_cdecl=.*#lt_cv_sys_global_symbol_to_cdecl="sed -n -e '"'"'s/^T .* \\\\(.*\\\\)$/extern int \\\\1();/p'"'"' -e '"'"'s/^$symcode* .* \\\\(.*\\\\)$/extern char \\\\1;/p'"'"'"#' $file; \ diff -u $file.backup $file && mv $file.backup $file \ - done ; + done %configure \ %{set_build_flags}; \ diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index f4496f4..7414291 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 159 +Version: 160 Release: 1%{?dist} # No version specified. License: GPL+ @@ -207,6 +207,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Thu Jun 04 2020 Igor Raits - 160-1 +- Fix broken %%configure + * Wed Jun 03 2020 Igor Raits - 159-1 - Fixes for new_package macro