Accepting request 568519 from home:Andreas_Schwab:Factory
- test-driver.patch: let perl find test_driver.pl - glob-interface.patch: Support GLIBC glob interface version 2 OBS-URL: https://build.opensuse.org/request/show/568519 OBS-URL: https://build.opensuse.org/package/show/Base:System/make?expand=0&rev=59
This commit is contained in:
Andreas Schwab
Git OBS Bridge
parent
89741dae72
commit
294e777977
34
glob-interface.patch
Normal file
34
glob-interface.patch
Normal file
@ -0,0 +1,34 @@
|
||||
* configure.ac: Support GLIBC glob interface version 2
|
||||
|
||||
Index: make-4.2.1/configure
|
||||
===================================================================
|
||||
--- make-4.2.1.orig/configure
|
||||
+++ make-4.2.1/configure
|
||||
@@ -11481,10 +11481,9 @@ else
|
||||
#include <glob.h>
|
||||
#include <fnmatch.h>
|
||||
|
||||
-#define GLOB_INTERFACE_VERSION 1
|
||||
#if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
|
||||
# include <gnu-versions.h>
|
||||
-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
|
||||
+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
|
||||
gnu glob
|
||||
# endif
|
||||
#endif
|
||||
Index: make-4.2.1/configure.ac
|
||||
===================================================================
|
||||
--- make-4.2.1.orig/configure.ac
|
||||
+++ make-4.2.1/configure.ac
|
||||
@@ -399,10 +399,9 @@ AC_CACHE_CHECK([if system libc has GNU g
|
||||
#include <glob.h>
|
||||
#include <fnmatch.h>
|
||||
|
||||
-#define GLOB_INTERFACE_VERSION 1
|
||||
#if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
|
||||
# include <gnu-versions.h>
|
||||
-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
|
||||
+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
|
||||
gnu glob
|
||||
# endif
|
||||
#endif],
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 23 09:56:03 UTC 2018 - schwab@suse.de
|
||||
|
||||
- test-driver.patch: let perl find test_driver.pl
|
||||
- glob-interface.patch: Support GLIBC glob interface version 2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 6 08:52:40 UTC 2017 - schwab@suse.de
|
||||
|
||||
|
||||
15
make.spec
15
make.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package make
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -31,12 +31,16 @@ Patch1: make-testcases_timeout.diff
|
||||
# PATCH-FEATURE-OPENSUSE sort glob https://savannah.gnu.org/bugs/index.php?52076
|
||||
Patch2: make-sorted-glob.patch
|
||||
Patch3: glob-lstat.patch
|
||||
Patch4: glob-interface.patch
|
||||
Patch5: test-driver.patch
|
||||
Patch64: make-library-search-path.diff
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: pkgconfig
|
||||
Requires(post): %{install_info_prereq}
|
||||
Requires(preun): %{install_info_prereq}
|
||||
Recommends: %{name}-lang
|
||||
Provides: gmake
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
The GNU make command with extensive documentation.
|
||||
@ -48,11 +52,14 @@ The GNU make command with extensive documentation.
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
if [ %{_lib} == lib64 ]; then
|
||||
%patch64 -p1
|
||||
fi
|
||||
|
||||
%build
|
||||
autoreconf -fi
|
||||
export CFLAGS="%{optflags}"
|
||||
%configure
|
||||
make %{?_smp_mflags}
|
||||
@ -67,14 +74,13 @@ make %{?_smp_mflags} check || {
|
||||
}
|
||||
|
||||
%install
|
||||
make %{?_smp_mflags} DESTDIR=%{buildroot} install
|
||||
%make_install
|
||||
ln -s make %{buildroot}%{_bindir}/gmake
|
||||
%find_lang %{name}
|
||||
# gnumake.h was introduced in 4.0, looks useless
|
||||
rm %{buildroot}%{_includedir}/gnumake.h
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/make
|
||||
%{_bindir}/gmake
|
||||
%{_infodir}/make.info-*%{ext_info}
|
||||
@ -82,7 +88,6 @@ rm %{buildroot}%{_includedir}/gnumake.h
|
||||
%{_mandir}/man1/make.1%{ext_man}
|
||||
|
||||
%files lang -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
|
||||
%post
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
|
||||
|
||||
23
test-driver.patch
Normal file
23
test-driver.patch
Normal file
@ -0,0 +1,23 @@
|
||||
Index: make-4.2.1/Makefile.am
|
||||
===================================================================
|
||||
--- make-4.2.1.orig/Makefile.am
|
||||
+++ make-4.2.1/Makefile.am
|
||||
@@ -188,8 +188,8 @@ check-regression: tests/config-flags.pm
|
||||
rm -f tests/$$f; ln -s ../srctests/$$f tests; \
|
||||
done; fi ;; \
|
||||
esac; \
|
||||
- echo "cd tests && $(PERL) ./run_make_tests.pl -srcdir $(abs_srcdir) -make ../make$(EXEEXT) $(MAKETESTFLAGS)"; \
|
||||
- cd tests && $(PERL) ./run_make_tests.pl -srcdir '$(abs_srcdir)' -make '../make$(EXEEXT)' $(MAKETESTFLAGS); \
|
||||
+ echo "cd tests && $(PERL) -I. ./run_make_tests.pl -srcdir $(abs_srcdir) -make ../make$(EXEEXT) $(MAKETESTFLAGS)"; \
|
||||
+ cd tests && $(PERL) -I. ./run_make_tests.pl -srcdir '$(abs_srcdir)' -make '../make$(EXEEXT)' $(MAKETESTFLAGS); \
|
||||
else \
|
||||
echo "Can't find a working Perl ($(PERL)); the test suite requires Perl."; \
|
||||
fi; \
|
||||
Index: make-4.2.1/tests/run_make_tests
|
||||
===================================================================
|
||||
--- make-4.2.1.orig/tests/run_make_tests
|
||||
+++ make-4.2.1/tests/run_make_tests
|
||||
@@ -1,2 +1,2 @@
|
||||
#!/bin/sh
|
||||
-exec perl $0.pl ${1+"$@"}
|
||||
+exec perl -I ${0%/*} $0.pl ${1+"$@"}
|
||||
Loading…
Reference in New Issue
Block a user