From 66ab5489a37f2f4bfde1ee1b2df599d25a504b45 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 21 Nov 2017 15:50:53 +0900 Subject: [PATCH] Bump to pcre 8.41 [Model] All [BinType] AP [Customer] OPEN [Issue#] N/A [Request] N/A [Occurrence Version] N/A [Problem] version upgrade [Cause & Measure] pcre 8.39 -> 8.41 [Checking Method] pcre unit test [Team] Open Source Management and Setting Part [Developer] dh0128.kwak [Solution company] Samsung [Change Type] N/A Change-Id: I4d9374ebb19aebacb153a1a4fe94780a94427e84 --- Makefile.am | 18 +++++++++++++++++- packaging/pcre.spec | 19 ++++++++----------- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index 40055e5..22b6947 100644 --- a/Makefile.am +++ b/Makefile.am @@ -383,8 +383,24 @@ if WITH_PCRE8 libpcre_la_CFLAGS += $(VALGRIND_CFLAGS) endif # WITH_PCRE8 if WITH_PCRE16 -libpcre16_la_LDFLAGS = -no-undefined $(EXTRA_LIBPCRE16_LDFLAGS) +libpcre16_la_CFLAGS += $(VALGRIND_CFLAGS) endif # WITH_PCRE16 +if WITH_PCRE32 +libpcre32_la_CFLAGS += $(VALGRIND_CFLAGS) +endif # WITH_PCRE32 +endif # WITH_VALGRIND + +if WITH_GCOV +if WITH_PCRE8 +libpcre_la_CFLAGS += $(GCOV_CFLAGS) +endif # WITH_PCRE8 +if WITH_PCRE16 +libpcre16_la_CFLAGS += $(GCOV_CFLAGS) +endif # WITH_PCRE16 +if WITH_PCRE32 +libpcre32_la_CFLAGS += $(GCOV_CFLAGS) +endif # WITH_PCRE32 +endif # WITH_GCOV CLEANFILES += pcre_chartables.c diff --git a/packaging/pcre.spec b/packaging/pcre.spec index 83f6741..6d63f5e 100644 --- a/packaging/pcre.spec +++ b/packaging/pcre.spec @@ -1,12 +1,13 @@ -%define run_tests 0 -%if %{run_tests} - # check is defined off at .rpmmacros file. + +%if "%{run_tests}" == "1" + %define __spec_check_pre %___build_pre %define check %%check %endif + %define keepstatic 1 Name: pcre -Version: 8.39 +Version: 8.41 Release: 0 License: BSD-2.0 Summary: A library for Perl-compatible regular expressions @@ -107,9 +108,6 @@ autoreconf -fiv %ifarch %ix86 x86_64 %arm ppc ppc64 mips --enable-jit \ %endif -%ifarch aarch64 - --disable-jit \ -%endif --enable-static \ --with-link-size=2 \ --with-match-limit=10000000 \ @@ -118,11 +116,10 @@ autoreconf -fiv --enable-unicode-properties make %{?_smp_mflags} -%check -%if %{run_tests} - %__make check || exit 0 -%endif +%check +export LANG=POSIX +make check || exit 0 %install %make_install -- 2.7.4