From 934f62cb2a77d4993ac77efc5095e2ed3d64b1dd Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 11 Mar 2016 09:10:26 +0000 Subject: [PATCH] Add patch to fix underlinking of test-archive --- debian/changelog | 1 + debian/patches/series | 1 + .../test-libarchive-fix-underlinking.patch | 24 +++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 debian/patches/series create mode 100644 debian/patches/test-libarchive-fix-underlinking.patch diff --git a/debian/changelog b/debian/changelog index 229d8ae9..056d889b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Wed, 27 Jan 2016 13:04:34 +0100 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..01d9dfdc --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +test-libarchive-fix-underlinking.patch diff --git a/debian/patches/test-libarchive-fix-underlinking.patch b/debian/patches/test-libarchive-fix-underlinking.patch new file mode 100644 index 00000000..0740c91f --- /dev/null +++ b/debian/patches/test-libarchive-fix-underlinking.patch @@ -0,0 +1,24 @@ +From: Simon McVittie +Date: Fri, 11 Mar 2016 08:46:27 +0000 +Subject: test-libarchive: fix underlinking + +Signed-off-by: Simon McVittie +--- + 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)