Skip to content
Snippets Groups Projects
Commit d8691f92 authored by Adrien Béraud's avatar Adrien Béraud Committed by Sébastien Blin
Browse files

contrib: disable building prce executables


* add patch to prevent the build of pcre executables and tests
* update pcre from 8.40 to 8.41

Change-Id: I0cd008e59c905ab44a02c11808a8cf9233063817
Reviewed-by: default avatarSébastien Blin <sebastien.blin@savoirfairelinux.com>
parent 621198db
No related branches found
No related tags found
No related merge requests found
From a33857636bb0721469bc08173dd196138457fa6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Tue, 3 Oct 2017 15:52:48 +0200
Subject: [PATCH] build: don't build executables
Disables building pcregrep and pcretest.
---
Makefile.am | 41 -----------------------------------------
1 file changed, 41 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 22b6947..58cc22b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -487,47 +487,6 @@ endif # WITH_PCRE_CPP
# Each unit test is a binary plus a script that runs that binary in various
# ways. We install these test binaries in case folks find it helpful.
-TESTS += RunTest
-dist_noinst_SCRIPTS += RunTest
-EXTRA_DIST += RunTest.bat
-bin_PROGRAMS += pcretest
-pcretest_SOURCES = pcretest.c
-pcretest_CFLAGS = $(AM_CFLAGS)
-pcretest_LDADD = $(LIBREADLINE)
-if WITH_PCRE8
-pcretest_SOURCES += pcre_printint.c
-pcretest_LDADD += libpcre.la libpcreposix.la
-endif # WITH_PCRE8
-if WITH_PCRE16
-pcretest_SOURCES += pcre16_printint.c
-pcretest_LDADD += libpcre16.la
-endif # WITH_PCRE16
-if WITH_PCRE32
-pcretest_SOURCES += pcre32_printint.c
-pcretest_LDADD += libpcre32.la
-endif # WITH_PCRE32
-if WITH_VALGRIND
-pcretest_CFLAGS += $(VALGRIND_CFLAGS)
-endif # WITH_VALGRIND
-if WITH_GCOV
-pcretest_CFLAGS += $(GCOV_CFLAGS)
-pcretest_LDADD += $(GCOV_LIBS)
-endif # WITH_GCOV
-
-if WITH_PCRE8
-TESTS += RunGrepTest
-dist_noinst_SCRIPTS += RunGrepTest
-bin_PROGRAMS += pcregrep
-pcregrep_SOURCES = pcregrep.c
-pcregrep_CFLAGS = $(AM_CFLAGS)
-pcregrep_LDADD = $(LIBZ) $(LIBBZ2)
-pcregrep_LDADD += libpcre.la libpcreposix.la
-if WITH_GCOV
-pcregrep_CFLAGS += $(GCOV_CFLAGS)
-pcregrep_LDADD += $(GCOV_LIBS)
-endif # WITH_GCOV
-endif # WITH_PCRE8
-
EXTRA_DIST += \
testdata/grepbinary \
testdata/grepfilelist \
--
2.13.1
b4c27eafbdf33bd7a1384655b1936f4be3bc6745c072347eb26e988896c52664bd85ac42444da1be78b6e20f45b6c7e5921f5f20f5b0741b5bd3d9844e5bd4e2 pcre-8.40.tar.bz2 cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551 pcre-8.41.tar.bz2
\ No newline at end of file
# Perl Compatible Regular Expression # Perl Compatible Regular Expression
PCRE_VERSION := 8.40 PCRE_VERSION := 8.41
PCRE_URL := ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$(PCRE_VERSION).tar.bz2 PCRE_URL := ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$(PCRE_VERSION).tar.bz2
PKGS += pcre PKGS += pcre
...@@ -19,9 +19,11 @@ $(TARBALLS)/pcre-$(PCRE_VERSION).tar.bz2: ...@@ -19,9 +19,11 @@ $(TARBALLS)/pcre-$(PCRE_VERSION).tar.bz2:
pcre: pcre-$(PCRE_VERSION).tar.bz2 .sum-pcre pcre: pcre-$(PCRE_VERSION).tar.bz2 .sum-pcre
$(UNPACK) $(UNPACK)
$(APPLY) $(SRC)/pcre/0001-build-don-t-build-executables.patch
$(MOVE) $(MOVE)
.pcre: pcre .pcre: pcre
$(RECONF)
cd $< && $(HOSTVARS) ./configure --disable-cpp $(HOSTCONF) cd $< && $(HOSTVARS) ./configure --disable-cpp $(HOSTCONF)
cd $< && $(MAKE) install cd $< && $(MAKE) install
touch $@ touch $@
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment