rpms
/
nbdkit
7
0
Fork 0
Code Issues Pull Requests Releases Activity
nbdkit/0002-windows-Link-plugins-f...

237 lines
8.4 KiB
Diff
Raw Blame History

From f768c949fdd01722ba79da7a1b2c55de75ef450a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 9 Dec 2021 18:23:32 +0000
Subject: [PATCH] windows: Link plugins/filters that use utils + pread/pwrite
with libcompat
Fixes: commit ce0db9d7736dd28dd0f10951ce65853e50b35e41
Fixes: commit aaca7cfaede90c681265f8a413e250accbf1d5f6
(cherry picked from commit dd9ba851c18527f70036317c71672161517577ec)
---
filters/blocksize/Makefile.am | 1 +
filters/cacheextents/Makefile.am | 1 +
filters/checkwrite/Makefile.am | 1 +
filters/error/Makefile.am | 1 +
filters/ip/Makefile.am | 1 +
filters/limit/Makefile.am | 1 +
filters/multi-conn/Makefile.am | 1 +
filters/offset/Makefile.am | 1 +
filters/partition/Makefile.am | 1 +
filters/readahead/Makefile.am | 1 +
filters/retry/Makefile.am | 1 +
filters/stats/Makefile.am | 1 +
filters/swab/Makefile.am | 1 +
filters/truncate/Makefile.am | 1 +
filters/xz/Makefile.am | 1 +
plugins/random/Makefile.am | 1 +
plugins/sparse-random/Makefile.am | 1 +
17 files changed, 17 insertions(+)
diff --git a/filters/blocksize/Makefile.am b/filters/blocksize/Makefile.am
index 5cda19bd..d09e595b 100644
--- a/filters/blocksize/Makefile.am
+++ b/filters/blocksize/Makefile.am
@@ -52,6 +52,7 @@ nbdkit_blocksize_filter_la_LDFLAGS = \
$(NULL)
nbdkit_blocksize_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/cacheextents/Makefile.am b/filters/cacheextents/Makefile.am
index 5ddffe98..40498416 100644
--- a/filters/cacheextents/Makefile.am
+++ b/filters/cacheextents/Makefile.am
@@ -52,6 +52,7 @@ nbdkit_cacheextents_filter_la_LDFLAGS = \
$(NULL)
nbdkit_cacheextents_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/checkwrite/Makefile.am b/filters/checkwrite/Makefile.am
index 2171b989..b53a5c0a 100644
--- a/filters/checkwrite/Makefile.am
+++ b/filters/checkwrite/Makefile.am
@@ -52,6 +52,7 @@ nbdkit_checkwrite_filter_la_LDFLAGS = \
$(NULL)
nbdkit_checkwrite_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/error/Makefile.am b/filters/error/Makefile.am
index 8ce8dc32..3174c3f9 100644
--- a/filters/error/Makefile.am
+++ b/filters/error/Makefile.am
@@ -52,6 +52,7 @@ nbdkit_error_filter_la_LDFLAGS = \
$(NULL)
nbdkit_error_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/ip/Makefile.am b/filters/ip/Makefile.am
index d09cd1e0..42fa6407 100644
--- a/filters/ip/Makefile.am
+++ b/filters/ip/Makefile.am
@@ -52,6 +52,7 @@ nbdkit_ip_filter_la_LDFLAGS = \
$(NULL)
nbdkit_ip_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/limit/Makefile.am b/filters/limit/Makefile.am
index b4951ace..364965ff 100644
--- a/filters/limit/Makefile.am
+++ b/filters/limit/Makefile.am
@@ -51,6 +51,7 @@ nbdkit_limit_filter_la_LDFLAGS = \
$(NULL)
nbdkit_limit_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/multi-conn/Makefile.am b/filters/multi-conn/Makefile.am
index 778b8947..2289e24e 100644
--- a/filters/multi-conn/Makefile.am
+++ b/filters/multi-conn/Makefile.am
@@ -48,6 +48,7 @@ nbdkit_multi_conn_filter_la_CPPFLAGS = \
nbdkit_multi_conn_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
nbdkit_multi_conn_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
nbdkit_multi_conn_filter_la_LDFLAGS = \
diff --git a/filters/offset/Makefile.am b/filters/offset/Makefile.am
index 5437e700..68986e37 100644
--- a/filters/offset/Makefile.am
+++ b/filters/offset/Makefile.am
@@ -51,6 +51,7 @@ nbdkit_offset_filter_la_LDFLAGS = \
$(NULL)
nbdkit_offset_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/partition/Makefile.am b/filters/partition/Makefile.am
index e8a20c68..d9500794 100644
--- a/filters/partition/Makefile.am
+++ b/filters/partition/Makefile.am
@@ -56,6 +56,7 @@ nbdkit_partition_filter_la_LDFLAGS = \
$(NULL)
nbdkit_partition_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/readahead/Makefile.am b/filters/readahead/Makefile.am
index 3d2c507d..65ad03b5 100644
--- a/filters/readahead/Makefile.am
+++ b/filters/readahead/Makefile.am
@@ -52,6 +52,7 @@ nbdkit_readahead_filter_la_LDFLAGS = \
$(NULL)
nbdkit_readahead_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/retry/Makefile.am b/filters/retry/Makefile.am
index 14d83cf1..522c0816 100644
--- a/filters/retry/Makefile.am
+++ b/filters/retry/Makefile.am
@@ -52,6 +52,7 @@ nbdkit_retry_filter_la_LDFLAGS = \
$(NULL)
nbdkit_retry_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/stats/Makefile.am b/filters/stats/Makefile.am
index ccfeb3e7..e81aa973 100644
--- a/filters/stats/Makefile.am
+++ b/filters/stats/Makefile.am
@@ -52,6 +52,7 @@ nbdkit_stats_filter_la_LDFLAGS = \
$(NULL)
nbdkit_stats_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/swab/Makefile.am b/filters/swab/Makefile.am
index 07aefe88..3388b7da 100644
--- a/filters/swab/Makefile.am
+++ b/filters/swab/Makefile.am
@@ -57,6 +57,7 @@ nbdkit_swab_filter_la_LDFLAGS = \
$(NULL)
nbdkit_swab_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(GNUTLS_LIBS) \
$(NULL)
diff --git a/filters/truncate/Makefile.am b/filters/truncate/Makefile.am
index 3240e46d..0940b96f 100644
--- a/filters/truncate/Makefile.am
+++ b/filters/truncate/Makefile.am
@@ -52,6 +52,7 @@ nbdkit_truncate_filter_la_LDFLAGS = \
$(NULL)
nbdkit_truncate_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/xz/Makefile.am b/filters/xz/Makefile.am
index ce6bc342..393ff142 100644
--- a/filters/xz/Makefile.am
+++ b/filters/xz/Makefile.am
@@ -57,6 +57,7 @@ nbdkit_xz_filter_la_CFLAGS = \
nbdkit_xz_filter_la_LIBADD = \
$(LIBLZMA_LIBS) \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
nbdkit_xz_filter_la_LDFLAGS = \
diff --git a/plugins/random/Makefile.am b/plugins/random/Makefile.am
index b29e06ad..4ad854f9 100644
--- a/plugins/random/Makefile.am
+++ b/plugins/random/Makefile.am
@@ -48,6 +48,7 @@ nbdkit_random_plugin_la_CPPFLAGS = \
nbdkit_random_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
nbdkit_random_plugin_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
nbdkit_random_plugin_la_LDFLAGS = \
diff --git a/plugins/sparse-random/Makefile.am b/plugins/sparse-random/Makefile.am
index d9d24fbe..b3ff0b86 100644
--- a/plugins/sparse-random/Makefile.am
+++ b/plugins/sparse-random/Makefile.am
@@ -50,6 +50,7 @@ nbdkit_sparse_random_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
nbdkit_sparse_random_plugin_la_LIBADD = \
$(top_builddir)/common/bitmap/libbitmap.la \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
nbdkit_sparse_random_plugin_la_LDFLAGS = \
--
2.31.1
Reference in New Issue View Git Blame Copy Permalink