starlingx/integ
Code Issues Proposed changes

Merge "remove libevent meta patch which disable test folder building removed patch base/libevent/files/libevent-disable-tests.patch"

Browse Source
This commit is contained in:
Zuul 2018-11-29 17:42:57 +00:00 committed by Gerrit Code Review
commit fbf2a6b77b
2 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
base/libevent/centos/meta_patches/spec-include-TiS-patches.patch
View File

@ -2,21 +2,19 @@ diff --git a/SPECS/libevent.spec b/SPECS/libevent.spec
index fd59ca3..9c6cc3e 100644
--- a/SPECS/libevent.spec
+++ b/SPECS/libevent.spec
@@ -13,6 +13,8 @@ BuildRequires: doxygen openssl-devel
@@ -13,6 +13,7 @@ BuildRequires: doxygen openssl-devel
Patch00: libevent-2.0.10-stable-configure.patch
# Disable network tests
Patch01: libevent-nonettests.patch
+Patch02: libevent-ipv6-client-socket.patch
+Patch03: libevent-disable-tests.patch
%description
The libevent API provides a mechanism to execute a callback function
@@ -49,6 +51,8 @@ need to install %{name}-doc.
@@ -49,6 +50,7 @@ need to install %{name}-doc.
# 477685 - libevent-devel multilib conflict
%patch00 -p1
%patch01 -p1 -b .nonettests
+%patch02 -p1
+%patch03 -p1
%build
%configure \

26
base/libevent/files/libevent-disable-tests.patch
View File

@ -1,26 +0,0 @@
diff --git a/Makefile.am b/Makefile.am
index 42879a3..dc90359 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -126,7 +126,7 @@ else
noinst_LTLIBRARIES = $(LIBEVENT_LIBS_LA)
endif
-SUBDIRS = . include sample test
+SUBDIRS = . include sample
if BUILD_WIN32
diff --git a/Makefile.in b/Makefile.in
index ac27389..aff0cf3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -534,7 +534,7 @@ LIBEVENT_LIBS_LA = libevent.la libevent_core.la libevent_extra.la \
@INSTALL_LIBEVENT_TRUE@lib_LTLIBRARIES = $(LIBEVENT_LIBS_LA)
@INSTALL_LIBEVENT_TRUE@pkgconfig_DATA = $(LIBEVENT_PKGCONFIG)
@INSTALL_LIBEVENT_FALSE@noinst_LTLIBRARIES = $(LIBEVENT_LIBS_LA)
-SUBDIRS = . include sample test
+SUBDIRS = . include sample
@BUILD_WIN32_FALSE@SYS_LIBS =
@BUILD_WIN32_TRUE@SYS_LIBS = -lws2_32 -lshell32 -ladvapi32
@BUILD_WIN32_FALSE@SYS_SRC = $(am__append_5) $(am__append_6) \