|
 |
c92cc1 |
From 320a7ec41342c95fd6bdc500cd207eb0ea5cda6a Mon Sep 17 00:00:00 2001
|
|
|
c92cc1 |
From: Giuseppe Scrivano <gscrivan@redhat.com>
|
|
|
c92cc1 |
Date: Fri, 19 Feb 2021 13:25:37 +0100
|
|
|
c92cc1 |
Subject: [PATCH] Revert "tests: build init always statically"
|
|
|
c92cc1 |
|
|
|
c92cc1 |
This reverts commit a0f322a49a10a014a447b505eda5923a8e6aff7c as it
|
|
|
c92cc1 |
causes issues on RHEL 8.
|
|
|
c92cc1 |
|
|
|
c92cc1 |
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
|
|
|
c92cc1 |
---
|
|
|
c92cc1 |
Makefile.am | 8 ++++----
|
|
|
c92cc1 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
c92cc1 |
|
|
|
c92cc1 |
diff --git a/Makefile.am b/Makefile.am
|
|
|
c92cc1 |
index e39dc3b..2b8e18b 100644
|
|
|
c92cc1 |
--- a/Makefile.am
|
|
|
c92cc1 |
+++ b/Makefile.am
|
|
|
c92cc1 |
@@ -14,7 +14,7 @@ srpm: dist-gzip rpm/crun.spec
|
|
|
c92cc1 |
$(MAKE) -C $(WD) dist-gzip
|
|
|
c92cc1 |
rpmbuild -bs --define "_sourcedir $(WD)" --define "_specdir $(WD)" --define "_builddir $(WD)" --define "_srcrpmdir $(WD)" --define "_rpmdir $(WD)" --define "_buildrootdir $(WD)/.build" rpm/crun.spec
|
|
|
c92cc1 |
|
|
|
c92cc1 |
-CLEANFILES = crun.spec tests/init
|
|
|
c92cc1 |
+CLEANFILES = crun.spec
|
|
|
c92cc1 |
|
|
|
c92cc1 |
lib_LTLIBRARIES = libcrun.la
|
|
|
c92cc1 |
|
|
|
c92cc1 |
@@ -79,9 +79,9 @@ noinst_PROGRAMS = tests/init $(UNIT_TESTS)
|
|
|
c92cc1 |
|
|
|
c92cc1 |
TESTS_LDADD = libcrun_testing.a $(FOUND_LIBS)
|
|
|
c92cc1 |
|
|
|
c92cc1 |
-tests/init: tests/init.c
|
|
|
c92cc1 |
- $(CC) -static-libgcc --static -o $@ $<
|
|
|
c92cc1 |
-EXTRA_DIST += tests/init.c
|
|
|
c92cc1 |
+tests_init_LDADD =
|
|
|
c92cc1 |
+tests_init_LDFLAGS = -static-libgcc -all-static
|
|
|
c92cc1 |
+tests_init_SOURCES = tests/init.c $(UNIT_TESTS)
|
|
|
c92cc1 |
|
|
|
c92cc1 |
tests_tests_libcrun_utils_CFLAGS = -I $(abs_top_builddir)/libocispec/src -I $(abs_top_srcdir)/libocispec/src -I $(abs_top_builddir)/src -I $(abs_top_srcdir)/src
|
|
|
c92cc1 |
tests_tests_libcrun_utils_SOURCES = tests/tests_libcrun_utils.c
|
|
|
c92cc1 |
--
|
|
|
c92cc1 |
2.29.2
|
|
|
c92cc1 |
|
|
|
c92cc1 |
|