packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add patch to fix underlinking of test-archive

This commit is contained in:
Simon McVittie 2016-03-11 09:10:26 +00:00
parent 86898fcf32
commit 934f62cb2a
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -31,6 +31,7 @@ ostree (2016.3-1) UNRELEASED; urgency=medium
practice
* Only build on Linux architectures; this package is specifically
not portable
* Add patch to fix underlinking of test-archive
-- Simon McVittie <smcv@debian.org> Wed, 27 Jan 2016 13:04:34 +0100

1
debian/patches/series vendored Normal file
View File

@ -0,0 +1 @@
test-libarchive-fix-underlinking.patch

24
debian/patches/test-libarchive-fix-underlinking.patch vendored Normal file
View File

@ -0,0 +1,24 @@
From: Simon McVittie <smcv@debian.org>
Date: Fri, 11 Mar 2016 08:46:27 +0000
Subject: test-libarchive: fix underlinking
Signed-off-by: Simon McVittie <smcv@debian.org>
---
Makefile-tests.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile-tests.am b/Makefile-tests.am
index 6ec5835..4b0a526 100644
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -179,8 +179,8 @@ tests_test_checksum_CFLAGS = $(TESTS_CFLAGS) $(libglnx_cflags)
tests_test_checksum_LDADD = $(TESTS_LDADD)
tests_test_libarchive_import_SOURCES = tests/test-libarchive-import.c
-tests_test_libarchive_import_CFLAGS = $(TESTS_CFLAGS) $(libglnx_cflags)
-tests_test_libarchive_import_LDADD = $(TESTS_LDADD)
+tests_test_libarchive_import_CFLAGS = $(TESTS_CFLAGS) $(libglnx_cflags) $(OT_DEP_LIBARCHIVE_CFLAGS)
+tests_test_libarchive_import_LDADD = $(TESTS_LDADD) $(OT_DEP_LIBARCHIVE_LIBS)
tests_test_keyfile_utils_CFLAGS = $(TESTS_CFLAGS)
tests_test_keyfile_utils_LDADD = $(TESTS_LDADD)