From b7919df7df229360e15194d7d8aa43dc7037feec Mon Sep 17 00:00:00 2001 From: openeuler-basic Date: Sat, 11 Jan 2020 17:15:22 +0800 Subject: [PATCH] delete redundant files --- ...pport-GLIBC-glob-interface-version-2.patch | 28 +++++++++++++++++++ ...pport-GLIBC-glob-interface-version-2.patch | 4 +-- ...b-Do-not-assume-glibc-glob-internals.patch | 4 +-- make-4.0-newlines.patch | 19 ------------- make-4.0-noclock_gettime.patch | 14 ---------- make-4.2-getcwd.patch | 12 -------- make-4.2.1-glob-fix-3.patch | 15 ---------- make.spec | 22 ++++++++------- 8 files changed, 44 insertions(+), 74 deletions(-) create mode 100644 configure-Support-GLIBC-glob-interface-version-2.patch rename make-4.2.1-glob-fix.patch => configure.ac-Support-GLIBC-glob-interface-version-2.patch (90%) rename make-4.2.1-glob-fix-2.patch => glob-Do-not-assume-glibc-glob-internals.patch (96%) delete mode 100644 make-4.0-newlines.patch delete mode 100644 make-4.0-noclock_gettime.patch delete mode 100644 make-4.2-getcwd.patch delete mode 100644 make-4.2.1-glob-fix-3.patch diff --git a/configure-Support-GLIBC-glob-interface-version-2.patch b/configure-Support-GLIBC-glob-interface-version-2.patch new file mode 100644 index 0000000..43199c1 --- /dev/null +++ b/configure-Support-GLIBC-glob-interface-version-2.patch @@ -0,0 +1,28 @@ +From 9fbc7566a76d72f9cfd697eb163f7c310d0bb7c5 Mon Sep 17 00:00:00 2001 +From: openeuler-basic +Date: Sat, 11 Jan 2020 17:07:07 +0800 +Subject: [PATCH] configure Support GLIBC glob interface version 2 + +--- + configure | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure b/configure +index bc62691..354d932 100755 +--- a/configure ++++ b/configure +@@ -11481,10 +11481,9 @@ else + #include + #include + +-#define GLOB_INTERFACE_VERSION 1 + #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 + # include +-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION ++# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 + gnu glob + # endif + #endif +-- +1.8.3.1 + diff --git a/make-4.2.1-glob-fix.patch b/configure.ac-Support-GLIBC-glob-interface-version-2.patch similarity index 90% rename from make-4.2.1-glob-fix.patch rename to configure.ac-Support-GLIBC-glob-interface-version-2.patch index be3abae..49c53d0 100644 --- a/make-4.2.1-glob-fix.patch +++ b/configure.ac-Support-GLIBC-glob-interface-version-2.patch @@ -1,7 +1,7 @@ From 48c8a116a914a325a0497721f5d8b58d5bba34d4 Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Sun, 19 Nov 2017 15:09:16 -0500 -Subject: * configure.ac: Support GLIBC glob interface version 2 +Subject: [PATCH] * configure.ac: Support GLIBC glob interface version 2 --- configure.ac | 3 +-- @@ -24,5 +24,5 @@ index 8c72568..4710832 100644 # endif #endif], -- -cgit v1.0-41-gc330 +1.8.3.1 diff --git a/make-4.2.1-glob-fix-2.patch b/glob-Do-not-assume-glibc-glob-internals.patch similarity index 96% rename from make-4.2.1-glob-fix-2.patch rename to glob-Do-not-assume-glibc-glob-internals.patch index 911e315..516d5ca 100644 --- a/make-4.2.1-glob-fix-2.patch +++ b/glob-Do-not-assume-glibc-glob-internals.patch @@ -1,7 +1,7 @@ From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 24 Sep 2017 09:12:58 -0400 -Subject: glob: Do not assume glibc glob internals. +Subject: [PATCH] glob: Do not assume glibc glob internals. It has been proposed that glibc glob start using gl_lstat, which the API allows it to do. GNU 'make' should not get in @@ -63,5 +63,5 @@ index adbb8a9..c343e4c 100644 void -- -cgit v1.0-41-gc330 +1.8.3.1 diff --git a/make-4.0-newlines.patch b/make-4.0-newlines.patch deleted file mode 100644 index add32c5..0000000 --- a/make-4.0-newlines.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Nrup a/job.c b/job.c ---- a/job.c 2014-02-03 18:23:45.936436714 -0500 -+++ b/job.c 2014-02-04 00:17:53.232074893 -0500 -@@ -3269,13 +3269,14 @@ construct_command_argv_internal (char *l - #endif - if (PRESERVE_BSNL) - { -- *(ap++) = '\\'; -+ *(ap++) = '\''; - /* Only non-batch execution needs another backslash, - because it will be passed through a recursive - invocation of this function. */ - if (!batch_mode_shell) - *(ap++) = '\\'; - *(ap++) = '\n'; -+ *(ap++) = '\''; - } - ++p; - continue; diff --git a/make-4.0-noclock_gettime.patch b/make-4.0-noclock_gettime.patch deleted file mode 100644 index f63e1fc..0000000 --- a/make-4.0-noclock_gettime.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up make-3.82/configure\~ make-3.82/configure ---- make-3.82/configure~ 2010-07-28 07:41:51.000000000 +0200 -+++ make-3.82/configure 2010-08-11 15:07:50.000000000 +0200 -@@ -7215,7 +7215,7 @@ return clock_gettime (); - return 0; - } - _ACEOF --for ac_lib in '' rt posix4; do -+for ac_lib in '' posix4; do - if test -z "$ac_lib"; then - ac_res="none required" - else - -Diff finished. Wed Aug 11 15:07:59 2010 diff --git a/make-4.2-getcwd.patch b/make-4.2-getcwd.patch deleted file mode 100644 index 6c47238..0000000 --- a/make-4.2-getcwd.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nrup a/makeint.h b/makeint.h ---- a/makeint.h 2016-05-21 16:22:32.000000000 -0400 -+++ b/makeint.h 2016-09-22 16:12:38.606702160 -0400 -@@ -596,7 +596,7 @@ long int lseek (); - # endif - - # ifdef HAVE_GETCWD --# if !defined(VMS) && !defined(__DECC) -+# if !defined(VMS) && !defined(__DECC) && !defined(getcwd) - char *getcwd (); - # endif - # else diff --git a/make-4.2.1-glob-fix-3.patch b/make-4.2.1-glob-fix-3.patch deleted file mode 100644 index 879fe50..0000000 --- a/make-4.2.1-glob-fix-3.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nrup a/configure b/configure ---- a/configure 2018-03-18 23:53:43.991741060 -0400 -+++ b/configure 2018-03-18 23:52:52.456028175 -0400 -@@ -11481,10 +11481,9 @@ else - #include - #include - --#define GLOB_INTERFACE_VERSION 1 - #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 - # include --# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION -+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 - gnu glob - # endif - #endif diff --git a/make.spec b/make.spec index a406eb3..c5b1cda 100644 --- a/make.spec +++ b/make.spec @@ -1,21 +1,15 @@ Name: make Epoch: 1 Version: 4.2.1 -Release: 11 +Release: 12 Summary: A tool which controls the generation of executables and non-source files of a program License: GPLv3+ URL: http://www.gnu.org/software/make/ Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2 -Patch0: make-4.0-newlines.patch -Patch1: make-4.0-noclock_gettime.patch -Patch2: make-4.0-weird-shell.patch -Patch3: make-4.2-getcwd.patch -Patch4: make-4.2-j8k.patch -Patch5: make-4.2.1-glob-fix-2.patch -Patch6: make-4.2.1-glob-fix.patch -Patch7: make-4.2.1-glob-fix-3.patch -Patch8: make-4.2.1-test-driver.patch +Patch1: make-4.0-weird-shell.patch +Patch2: make-4.2-j8k.patch +Patch3: make-4.2.1-test-driver.patch Patch6000: src-makeint.h-Use-pid_t-to-store-PIDs-of-int.patch Patch6001: Queue-failed-fork-etc.-to-be-handled-like-any-other-.patch @@ -23,6 +17,11 @@ Patch6002: src-job.c-reap_children-Fix-inverted-win-lose-messag.patch Patch6003: SV-54233-Preserve-higher-command_state-values-on-als.patch Patch6004: src-main.c-main-Set-jobserver-permissions-before-re-.patch Patch6005: main.c-main-SV-48274-Allow-j-in-makefile-MAKEFLAGS-v.patch +Patch6006: configure.ac-Support-GLIBC-glob-interface-version-2.patch +Patch6007: glob-Do-not-assume-glibc-glob-internals.patch +Patch6008: configure-Support-GLIBC-glob-interface-version-2.patch + + BuildRequires: gcc git autoconf automake procps BuildRequires: guile-devel perl-interpreter make @@ -96,5 +95,8 @@ fi %{_infodir}/* %changelog +* Sat Jan 11 2020 openEuler Buildteam - 1:4.2.1-12 +- Delete redundant files + * Wed Oct 30 2019 openEuler Buildteam - 1:4.2.1-11 - Package init