Attempt to fix CONFIG_HEADER again
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
parent
d78a5b0752
commit
977e35a8f0
GPG Key ID:
8B7F1DA0E2C9FDBB
|
|
@ -0,0 +1,91 @@
|
|||
From f3239cca6ef6ed5f48e92cbc5f6525097a633779 Mon Sep 17 00:00:00 2001
|
||||
From: Jim Meyering <meyering@fb.com>
|
||||
Date: Sat, 10 Jul 2021 13:28:30 -0700
|
||||
Subject: [PATCH] maint: update obsolete constructs in configure.ac
|
||||
|
||||
* configure.ac: Avoid autoconf warnings:
|
||||
Switch from obsolete AM_CONFIG_HEADER to AC_CONFIG_HEADERS, and quote.
|
||||
Use AC_PROG_CC_STDC, not AC_PROG_CC.
|
||||
Convert from obsolete AC_TRY_RUN to AC_RUN_IFELSE.
|
||||
---
|
||||
configure.ac | 19 +++++++++++--------
|
||||
1 file changed, 11 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 4c701c1..8fc927f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -19,14 +19,14 @@ AC_INIT([GNU sed],
|
||||
[bug-sed@gnu.org])
|
||||
AC_CONFIG_AUX_DIR(build-aux)
|
||||
AC_CONFIG_SRCDIR([sed/sed.c])
|
||||
-AM_CONFIG_HEADER(config.h:config_h.in)
|
||||
+AC_CONFIG_HEADERS([config.h:config_h.in])
|
||||
AC_PREREQ([2.64])
|
||||
AM_INIT_AUTOMAKE([1.11.1 dist-xz color-tests parallel-tests
|
||||
subdir-objects])
|
||||
AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
-AC_PROG_CC_STDC
|
||||
+AC_PROG_CC
|
||||
AM_PROG_CC_C_O
|
||||
gl_EARLY
|
||||
gl_INIT
|
||||
@@ -62,7 +62,8 @@ AC_DEFUN([gl_GCC_VERSION_IFELSE],
|
||||
)
|
||||
|
||||
AC_CACHE_CHECK([whether "rt" can be used with fopen], [sed_cv_fopen_rt], [
|
||||
-AC_TRY_RUN([
|
||||
+AC_RUN_IFELSE(
|
||||
+ [AC_LANG_SOURCE([[
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
||||
@@ -74,7 +75,7 @@ int main()
|
||||
fp = fopen ("conftest.c", "rt");
|
||||
if (fp) fclose (fp);
|
||||
return fp ? 0 : 1;
|
||||
-}], [sed_cv_fopen_rt=yes],
|
||||
+}]])], [sed_cv_fopen_rt=yes],
|
||||
[sed_cv_fopen_rt=no],
|
||||
[case $host in
|
||||
*cygwin* | *mingw*) sed_cv_fopen_rt=yes ;;
|
||||
@@ -86,7 +87,8 @@ if test "$sed_cv_fopen_rt" = yes; then
|
||||
fi
|
||||
|
||||
AC_CACHE_CHECK([whether -lcP is needed], [sed_cv_libcp_needed], [
|
||||
-AC_TRY_RUN([
|
||||
+AC_RUN_IFELSE(
|
||||
+ [AC_LANG_SOURCE([[
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
||||
@@ -100,7 +102,7 @@ int main()
|
||||
result = fflush (fp) == EOF && errno == 0;
|
||||
fclose (fp);
|
||||
return result;
|
||||
-}], [sed_cv_libcp_needed=no],
|
||||
+}]])], [sed_cv_libcp_needed=no],
|
||||
[sed_cv_libcp_needed=yes],
|
||||
[sed_cv_libcp_needed="assuming no"])
|
||||
])
|
||||
@@ -143,7 +145,8 @@ fi
|
||||
# have a couple of platforms where these tests pass. Right now, only
|
||||
# Windows and HP/UX do not support the tests.
|
||||
AC_MSG_CHECKING([whether UTF-8 case folding tests should pass])
|
||||
-AC_TRY_RUN([
|
||||
+AC_RUN_IFELSE(
|
||||
+ [AC_LANG_SOURCE([[
|
||||
#include <locale.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
@@ -204,7 +207,7 @@ int main()
|
||||
setlocale (LC_CTYPE, old);
|
||||
exit (!test ());
|
||||
}
|
||||
-], [AC_MSG_RESULT([yes]); XFAIL_TESTS=],
|
||||
+]])], [AC_MSG_RESULT([yes]); XFAIL_TESTS=],
|
||||
[AC_MSG_RESULT([no]); XFAIL_TESTS='testsuite/utf8-1 testsuite/utf8-2 \
|
||||
testsuite/utf8-3 testsuite/utf8-4'],
|
||||
[AC_MSG_RESULT([don't care (cross compiling)]); XFAIL_TESTS=])
|
||||
13
sed.spec
13
sed.spec
|
|
@ -1,13 +1,9 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
%ifarch riscv64
|
||||
%global debug_package %{nil}
|
||||
%endif
|
||||
|
||||
Summary: A GNU stream text editor
|
||||
Name: sed
|
||||
Version: 4.8
|
||||
Release: 11.1.riscv64%{?dist}
|
||||
Release: 11.2.riscv64%{?dist}
|
||||
License: GPLv3+
|
||||
URL: http://sed.sourceforge.net/
|
||||
Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.xz
|
||||
|
|
@ -15,6 +11,7 @@ Source1: http://sed.sourceforge.net/sedfaq.txt
|
|||
Patch0: sed-b-flag.patch
|
||||
Patch1: sed-c-flag.patch
|
||||
Patch2: sed-covscan-annotations.patch
|
||||
Patch8: f3239cca6ef6ed5f48e92cbc5f6525097a633779.patch
|
||||
Patch9: b8f98f7dc3638384a6cd378c78f0a788fbf33b34.patch
|
||||
BuildRequires: make
|
||||
BuildRequires: glibc-devel, libselinux-devel, libacl-devel, automake, autoconf, gcc
|
||||
|
|
@ -39,6 +36,7 @@ specified in a script file or from the command line.
|
|||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
|
||||
|
||||
|
|
@ -73,14 +71,11 @@ rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir
|
|||
%{_mandir}/man1/sed.1*
|
||||
|
||||
%changelog
|
||||
* Tue Aug 08 2022 David Abdurachmanov <davidlt@rivosinc.com> - 4.8-11.1.riscv64
|
||||
* Tue Aug 08 2022 David Abdurachmanov <davidlt@rivosinc.com> - 4.8-11.2.riscv64
|
||||
- Regenerate build system (autoreconf)
|
||||
- Fix testsuite (export CONFIG_HEADER to test scripts)
|
||||
- Add BR for gettext-devel (autopoint)
|
||||
|
||||
* Mon Aug 08 2022 David Abdurachmanov <davidlt@rivosinc.com> - 4.8-11.0.riscv64
|
||||
- Disable debug packages on riscv64
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.8-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue