Accepting request 683893 from devel:libraries:c_c++
OBS-URL: https://build.opensuse.org/request/show/683893 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/augeas?expand=0&rev=49
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
14a93117c4
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 11 13:09:47 UTC 2019 - Martin Liška <mliska@suse.cz>
|
||||
|
||||
- Add gcc9-disable-broken-test.patch in order to address bsc#1120894.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 12 15:01:42 UTC 2019 - Vítězslav Čížek <vcizek@suse.com>
|
||||
|
||||
|
||||
@ -29,6 +29,7 @@ Source1: http://download.augeas.net/augeas-%{version}.tar.gz.sig
|
||||
Source2: %{name}.keyring
|
||||
Source3: baselibs.conf
|
||||
Patch0: augeas-modprobe-lense.patch
|
||||
Patch1: gcc9-disable-broken-test.patch
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
@ -96,6 +97,7 @@ modifying the official lenses, or when creating new ones.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%configure \
|
||||
|
||||
196
gcc9-disable-broken-test.patch
Normal file
196
gcc9-disable-broken-test.patch
Normal file
@ -0,0 +1,196 @@
|
||||
diff --git a/gnulib/tests/Makefile.in b/gnulib/tests/Makefile.in
|
||||
index 6727c89..1674cef 100644
|
||||
--- a/gnulib/tests/Makefile.in
|
||||
+++ b/gnulib/tests/Makefile.in
|
||||
@@ -131,7 +131,7 @@ TESTS = test-accept$(EXEEXT) test-alloca-opt$(EXEEXT) \
|
||||
test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \
|
||||
test-limits-h$(EXEEXT) test-listen$(EXEEXT) \
|
||||
test-locale$(EXEEXT) test-localeconv$(EXEEXT) \
|
||||
- test-localename$(EXEEXT) test-rwlock1$(EXEEXT) \
|
||||
+ test-localename$(EXEEXT) \
|
||||
test-lock$(EXEEXT) test-once1$(EXEEXT) test-once2$(EXEEXT) \
|
||||
test-lstat$(EXEEXT) test-malloca$(EXEEXT) test-mbrtowc1.sh \
|
||||
test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \
|
||||
@@ -163,7 +163,7 @@ TESTS = test-accept$(EXEEXT) test-alloca-opt$(EXEEXT) \
|
||||
test-sys_stat$(EXEEXT) test-sys_time$(EXEEXT) \
|
||||
test-sys_types$(EXEEXT) test-sys_uio$(EXEEXT) \
|
||||
test-sys_wait$(EXEEXT) test-init.sh test-thread_self$(EXEEXT) \
|
||||
- test-thread_create$(EXEEXT) test-time$(EXEEXT) \
|
||||
+ test-time$(EXEEXT) \
|
||||
test-unistd$(EXEEXT) test-unsetenv$(EXEEXT) \
|
||||
test-usleep$(EXEEXT) test-vasnprintf$(EXEEXT) \
|
||||
test-vasprintf$(EXEEXT) test-verify$(EXEEXT) test-verify.sh \
|
||||
@@ -193,7 +193,7 @@ check_PROGRAMS = test-accept$(EXEEXT) test-alloca-opt$(EXEEXT) \
|
||||
test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \
|
||||
test-limits-h$(EXEEXT) test-listen$(EXEEXT) \
|
||||
test-locale$(EXEEXT) test-localeconv$(EXEEXT) \
|
||||
- test-localename$(EXEEXT) test-rwlock1$(EXEEXT) \
|
||||
+ test-localename$(EXEEXT) \
|
||||
test-lock$(EXEEXT) test-once1$(EXEEXT) test-once2$(EXEEXT) \
|
||||
test-lstat$(EXEEXT) test-malloca$(EXEEXT) \
|
||||
test-mbrtowc$(EXEEXT) test-mbrtowc-w32$(EXEEXT) \
|
||||
@@ -223,7 +223,7 @@ check_PROGRAMS = test-accept$(EXEEXT) test-alloca-opt$(EXEEXT) \
|
||||
test-sys_stat$(EXEEXT) test-sys_time$(EXEEXT) \
|
||||
test-sys_types$(EXEEXT) test-sys_uio$(EXEEXT) \
|
||||
test-sys_wait$(EXEEXT) test-thread_self$(EXEEXT) \
|
||||
- test-thread_create$(EXEEXT) test-time$(EXEEXT) \
|
||||
+ test-time$(EXEEXT) \
|
||||
test-unistd$(EXEEXT) test-unsetenv$(EXEEXT) \
|
||||
test-usleep$(EXEEXT) test-vasnprintf$(EXEEXT) \
|
||||
test-vasprintf$(EXEEXT) test-verify$(EXEEXT) \
|
||||
@@ -762,9 +762,6 @@ test_readlink_DEPENDENCIES = libtests.a ../../gnulib/lib/libgnu.la \
|
||||
test_regex_SOURCES = test-regex.c
|
||||
test_regex_OBJECTS = test-regex.$(OBJEXT)
|
||||
test_regex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
|
||||
-test_rwlock1_SOURCES = test-rwlock1.c
|
||||
-test_rwlock1_OBJECTS = test-rwlock1.$(OBJEXT)
|
||||
-test_rwlock1_DEPENDENCIES = $(am__DEPENDENCIES_2)
|
||||
test_safe_alloc_SOURCES = test-safe-alloc.c
|
||||
test_safe_alloc_OBJECTS = test-safe-alloc.$(OBJEXT)
|
||||
test_safe_alloc_LDADD = $(LDADD)
|
||||
@@ -932,9 +929,6 @@ test_sys_wait_OBJECTS = test-sys_wait.$(OBJEXT)
|
||||
test_sys_wait_LDADD = $(LDADD)
|
||||
test_sys_wait_DEPENDENCIES = libtests.a ../../gnulib/lib/libgnu.la \
|
||||
libtests.a $(am__DEPENDENCIES_1)
|
||||
-test_thread_create_SOURCES = test-thread_create.c
|
||||
-test_thread_create_OBJECTS = test-thread_create.$(OBJEXT)
|
||||
-test_thread_create_DEPENDENCIES = $(am__DEPENDENCIES_2)
|
||||
test_thread_self_SOURCES = test-thread_self.c
|
||||
test_thread_self_OBJECTS = test-thread_self.$(OBJEXT)
|
||||
test_thread_self_DEPENDENCIES = $(am__DEPENDENCIES_2)
|
||||
@@ -1053,7 +1047,7 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
|
||||
$(test_once2_SOURCES) test-open.c test-pathmax.c test-perror.c \
|
||||
test-perror2.c test-pipe.c test-pthread_sigmask1.c \
|
||||
test-pthread_sigmask2.c test-raise.c test-rawmemchr.c \
|
||||
- test-readlink.c test-regex.c test-rwlock1.c test-safe-alloc.c \
|
||||
+ test-readlink.c test-regex.c test-safe-alloc.c \
|
||||
test-select.c test-select-fd.c test-select-stdin.c \
|
||||
test-setenv.c test-setlocale1.c test-setlocale2.c \
|
||||
test-setsockopt.c test-sigaction.c test-signal-h.c \
|
||||
@@ -1064,7 +1058,7 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
|
||||
test-strstr.c test-symlink.c test-sys_ioctl.c \
|
||||
test-sys_select.c test-sys_socket.c test-sys_stat.c \
|
||||
test-sys_time.c test-sys_types.c test-sys_uio.c \
|
||||
- test-sys_wait.c test-thread_create.c test-thread_self.c \
|
||||
+ test-sys_wait.c test-thread_self.c \
|
||||
test-time.c test-unistd.c test-unsetenv.c test-usleep.c \
|
||||
test-vasnprintf.c test-vasprintf.c test-verify.c \
|
||||
test-verify-try.c test-wchar.c test-wcrtomb.c \
|
||||
@@ -1090,7 +1084,7 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
|
||||
$(test_once2_SOURCES) test-open.c test-pathmax.c test-perror.c \
|
||||
test-perror2.c test-pipe.c test-pthread_sigmask1.c \
|
||||
test-pthread_sigmask2.c test-raise.c test-rawmemchr.c \
|
||||
- test-readlink.c test-regex.c test-rwlock1.c test-safe-alloc.c \
|
||||
+ test-readlink.c test-regex.c test-safe-alloc.c \
|
||||
test-select.c test-select-fd.c test-select-stdin.c \
|
||||
test-setenv.c test-setlocale1.c test-setlocale2.c \
|
||||
test-setsockopt.c test-sigaction.c test-signal-h.c \
|
||||
@@ -1101,7 +1095,7 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
|
||||
test-strstr.c test-symlink.c test-sys_ioctl.c \
|
||||
test-sys_select.c test-sys_socket.c test-sys_stat.c \
|
||||
test-sys_time.c test-sys_types.c test-sys_uio.c \
|
||||
- test-sys_wait.c test-thread_create.c test-thread_self.c \
|
||||
+ test-sys_wait.c test-thread_self.c \
|
||||
test-time.c test-unistd.c test-unsetenv.c test-usleep.c \
|
||||
test-vasnprintf.c test-vasprintf.c test-verify.c \
|
||||
test-verify-try.c test-wchar.c test-wcrtomb.c \
|
||||
@@ -2397,7 +2391,7 @@ EXTRA_DIST = accept.c w32sock.h test-accept.c signature.h macros.h \
|
||||
macros.h test-isblank.c signature.h macros.h test-langinfo.c \
|
||||
test-limits-h.c listen.c w32sock.h test-listen.c signature.h \
|
||||
macros.h test-locale.c test-localeconv.c signature.h macros.h \
|
||||
- localename.h test-localename.c macros.h test-rwlock1.c \
|
||||
+ localename.h test-localename.c macros.h \
|
||||
test-lock.c test-once.c test-lstat.h test-lstat.c signature.h \
|
||||
macros.h malloc.c test-malloca.c test-mbrtowc1.sh \
|
||||
test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \
|
||||
@@ -2447,7 +2441,7 @@ EXTRA_DIST = accept.c w32sock.h test-accept.c signature.h macros.h \
|
||||
test-sys_socket.c test-sys_stat.c test-sys_time.c \
|
||||
test-sys_types.c sys_uio.in.h test-sys_uio.c test-sys_wait.c \
|
||||
test-sys_wait.h init.sh test-init.sh test-thread_self.c \
|
||||
- test-thread_create.c macros.h test-time.c test-unistd.c \
|
||||
+ macros.h test-time.c test-unistd.c \
|
||||
unsetenv.c test-unsetenv.c signature.h macros.h usleep.c \
|
||||
test-usleep.c signature.h macros.h test-vasnprintf.c macros.h \
|
||||
test-vasprintf.c signature.h macros.h test-verify.c \
|
||||
@@ -2504,7 +2498,6 @@ test_getopt_posix_LDADD = $(LDADD) $(LIBINTL)
|
||||
test_inet_pton_LDADD = $(LDADD) @INET_PTON_LIB@
|
||||
test_listen_LDADD = $(LDADD) @LIBSOCKET@
|
||||
test_localename_LDADD = $(LDADD) @INTL_MACOSX_LIBS@ $(LIBTHREAD)
|
||||
-test_rwlock1_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
|
||||
test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
|
||||
test_once1_SOURCES = test-once.c
|
||||
test_once1_LDADD = $(LDADD) @LIBTHREAD@
|
||||
@@ -2547,7 +2540,6 @@ test_sockets_LDADD = $(LDADD) @LIBSOCKET@
|
||||
test_stat_LDADD = $(LDADD) $(LIBINTL)
|
||||
test_stat_time_LDADD = $(LDADD) $(LIB_NANOSLEEP)
|
||||
test_thread_self_LDADD = $(LDADD) @LIBTHREAD@
|
||||
-test_thread_create_LDADD = $(LDADD) @LIBMULTITHREAD@
|
||||
all: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||
|
||||
@@ -2904,10 +2896,6 @@ test-regex$(EXEEXT): $(test_regex_OBJECTS) $(test_regex_DEPENDENCIES) $(EXTRA_te
|
||||
@rm -f test-regex$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(test_regex_OBJECTS) $(test_regex_LDADD) $(LIBS)
|
||||
|
||||
-test-rwlock1$(EXEEXT): $(test_rwlock1_OBJECTS) $(test_rwlock1_DEPENDENCIES) $(EXTRA_test_rwlock1_DEPENDENCIES)
|
||||
- @rm -f test-rwlock1$(EXEEXT)
|
||||
- $(AM_V_CCLD)$(LINK) $(test_rwlock1_OBJECTS) $(test_rwlock1_LDADD) $(LIBS)
|
||||
-
|
||||
test-safe-alloc$(EXEEXT): $(test_safe_alloc_OBJECTS) $(test_safe_alloc_DEPENDENCIES) $(EXTRA_test_safe_alloc_DEPENDENCIES)
|
||||
@rm -f test-safe-alloc$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(test_safe_alloc_OBJECTS) $(test_safe_alloc_LDADD) $(LIBS)
|
||||
@@ -3052,10 +3040,6 @@ test-sys_wait$(EXEEXT): $(test_sys_wait_OBJECTS) $(test_sys_wait_DEPENDENCIES) $
|
||||
@rm -f test-sys_wait$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(test_sys_wait_OBJECTS) $(test_sys_wait_LDADD) $(LIBS)
|
||||
|
||||
-test-thread_create$(EXEEXT): $(test_thread_create_OBJECTS) $(test_thread_create_DEPENDENCIES) $(EXTRA_test_thread_create_DEPENDENCIES)
|
||||
- @rm -f test-thread_create$(EXEEXT)
|
||||
- $(AM_V_CCLD)$(LINK) $(test_thread_create_OBJECTS) $(test_thread_create_LDADD) $(LIBS)
|
||||
-
|
||||
test-thread_self$(EXEEXT): $(test_thread_self_OBJECTS) $(test_thread_self_DEPENDENCIES) $(EXTRA_test_thread_self_DEPENDENCIES)
|
||||
@rm -f test-thread_self$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(test_thread_self_OBJECTS) $(test_thread_self_LDADD) $(LIBS)
|
||||
@@ -3233,7 +3217,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-rawmemchr.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-readlink.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-regex.Po@am__quote@
|
||||
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-rwlock1.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-safe-alloc.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-select-fd.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-select-stdin.Po@am__quote@
|
||||
@@ -3270,7 +3253,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sys_types.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sys_uio.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-sys_wait.Po@am__quote@
|
||||
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-thread_create.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-thread_self.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-time.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-unistd.Po@am__quote@
|
||||
@@ -3889,13 +3871,6 @@ test-localename.log: test-localename$(EXEEXT)
|
||||
--log-file $$b.log --trs-file $$b.trs \
|
||||
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
"$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
-test-rwlock1.log: test-rwlock1$(EXEEXT)
|
||||
- @p='test-rwlock1$(EXEEXT)'; \
|
||||
- b='test-rwlock1'; \
|
||||
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
|
||||
- --log-file $$b.log --trs-file $$b.trs \
|
||||
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
- "$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
test-lock.log: test-lock$(EXEEXT)
|
||||
@p='test-lock$(EXEEXT)'; \
|
||||
b='test-lock'; \
|
||||
@@ -4407,13 +4382,6 @@ test-thread_self.log: test-thread_self$(EXEEXT)
|
||||
--log-file $$b.log --trs-file $$b.trs \
|
||||
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
"$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
-test-thread_create.log: test-thread_create$(EXEEXT)
|
||||
- @p='test-thread_create$(EXEEXT)'; \
|
||||
- b='test-thread_create'; \
|
||||
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
|
||||
- --log-file $$b.log --trs-file $$b.trs \
|
||||
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
- "$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
test-time.log: test-time$(EXEEXT)
|
||||
@p='test-time$(EXEEXT)'; \
|
||||
b='test-time'; \
|
||||
Loading…
Reference in New Issue
Block a user