mirror of
				https://git.proxmox.com/git/mirror_zfs.git
				synced 2025-10-26 18:05:04 +03:00 
			
		
		
		
	Add missing libzfs_core to Makefiles
On some platforms symbols provided by libzfs_core and used by libzfs were not available to the linker. To avoid this issue libzfs_core has been added to the list of required libraries when building utilities which depend on libzfs. This should have been handled properly by libtool and it's still not entirely clear why it wasn't on all platforms. Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #1841
This commit is contained in:
		
							parent
							
								
									e5bacf2109
								
							
						
					
					
						commit
						539defc873
					
				| @ -18,6 +18,7 @@ mount_zfs_LDADD = \ | |||||||
| 	$(top_builddir)/lib/libnvpair/libnvpair.la \
 | 	$(top_builddir)/lib/libnvpair/libnvpair.la \
 | ||||||
| 	$(top_builddir)/lib/libuutil/libuutil.la \
 | 	$(top_builddir)/lib/libuutil/libuutil.la \
 | ||||||
| 	$(top_builddir)/lib/libzpool/libzpool.la \
 | 	$(top_builddir)/lib/libzpool/libzpool.la \
 | ||||||
| 	$(top_builddir)/lib/libzfs/libzfs.la | 	$(top_builddir)/lib/libzfs/libzfs.la \
 | ||||||
|  | 	$(top_builddir)/lib/libzfs_core/libzfs_core.la | ||||||
| 
 | 
 | ||||||
| mount_zfs_LDADD += $(LIBSELINUX) | mount_zfs_LDADD += $(LIBSELINUX) | ||||||
|  | |||||||
| @ -14,6 +14,7 @@ zdb_LDADD = \ | |||||||
| 	$(top_builddir)/lib/libnvpair/libnvpair.la \
 | 	$(top_builddir)/lib/libnvpair/libnvpair.la \
 | ||||||
| 	$(top_builddir)/lib/libuutil/libuutil.la \
 | 	$(top_builddir)/lib/libuutil/libuutil.la \
 | ||||||
| 	$(top_builddir)/lib/libzpool/libzpool.la \
 | 	$(top_builddir)/lib/libzpool/libzpool.la \
 | ||||||
| 	$(top_builddir)/lib/libzfs/libzfs.la | 	$(top_builddir)/lib/libzfs/libzfs.la \
 | ||||||
|  | 	$(top_builddir)/lib/libzfs_core/libzfs_core.la | ||||||
| 
 | 
 | ||||||
| zdb_LDADD += $(ZLIB) | zdb_LDADD += $(ZLIB) | ||||||
|  | |||||||
| @ -13,6 +13,7 @@ zhack_LDADD = \ | |||||||
| 	$(top_builddir)/lib/libnvpair/libnvpair.la \
 | 	$(top_builddir)/lib/libnvpair/libnvpair.la \
 | ||||||
| 	$(top_builddir)/lib/libuutil/libuutil.la \
 | 	$(top_builddir)/lib/libuutil/libuutil.la \
 | ||||||
| 	$(top_builddir)/lib/libzpool/libzpool.la \
 | 	$(top_builddir)/lib/libzpool/libzpool.la \
 | ||||||
| 	$(top_builddir)/lib/libzfs/libzfs.la | 	$(top_builddir)/lib/libzfs/libzfs.la \
 | ||||||
|  | 	$(top_builddir)/lib/libzfs_core/libzfs_core.la | ||||||
| 
 | 
 | ||||||
| zhack_LDADD += $(ZLIB) | zhack_LDADD += $(ZLIB) | ||||||
|  | |||||||
| @ -15,4 +15,5 @@ zinject_LDADD = \ | |||||||
| 	$(top_builddir)/lib/libnvpair/libnvpair.la \
 | 	$(top_builddir)/lib/libnvpair/libnvpair.la \
 | ||||||
| 	$(top_builddir)/lib/libuutil/libuutil.la \
 | 	$(top_builddir)/lib/libuutil/libuutil.la \
 | ||||||
| 	$(top_builddir)/lib/libzpool/libzpool.la \
 | 	$(top_builddir)/lib/libzpool/libzpool.la \
 | ||||||
| 	$(top_builddir)/lib/libzfs/libzfs.la | 	$(top_builddir)/lib/libzfs/libzfs.la \
 | ||||||
|  | 	$(top_builddir)/lib/libzfs_core/libzfs_core.la | ||||||
|  | |||||||
| @ -17,4 +17,5 @@ zpool_LDADD = \ | |||||||
| 	$(top_builddir)/lib/libnvpair/libnvpair.la \
 | 	$(top_builddir)/lib/libnvpair/libnvpair.la \
 | ||||||
| 	$(top_builddir)/lib/libuutil/libuutil.la \
 | 	$(top_builddir)/lib/libuutil/libuutil.la \
 | ||||||
| 	$(top_builddir)/lib/libzpool/libzpool.la \
 | 	$(top_builddir)/lib/libzpool/libzpool.la \
 | ||||||
| 	$(top_builddir)/lib/libzfs/libzfs.la | 	$(top_builddir)/lib/libzfs/libzfs.la \
 | ||||||
|  | 	$(top_builddir)/lib/libzfs_core/libzfs_core.la | ||||||
|  | |||||||
| @ -13,6 +13,7 @@ zstreamdump_LDADD = \ | |||||||
| 	$(top_builddir)/lib/libnvpair/libnvpair.la \
 | 	$(top_builddir)/lib/libnvpair/libnvpair.la \
 | ||||||
| 	$(top_builddir)/lib/libuutil/libuutil.la \
 | 	$(top_builddir)/lib/libuutil/libuutil.la \
 | ||||||
| 	$(top_builddir)/lib/libzpool/libzpool.la \
 | 	$(top_builddir)/lib/libzpool/libzpool.la \
 | ||||||
| 	$(top_builddir)/lib/libzfs/libzfs.la | 	$(top_builddir)/lib/libzfs/libzfs.la \
 | ||||||
|  | 	$(top_builddir)/lib/libzfs_core/libzfs_core.la | ||||||
| 
 | 
 | ||||||
| zstreamdump_LDADD += $(ZLIB) | zstreamdump_LDADD += $(ZLIB) | ||||||
|  | |||||||
| @ -15,6 +15,7 @@ ztest_LDADD = \ | |||||||
| 	$(top_builddir)/lib/libnvpair/libnvpair.la \
 | 	$(top_builddir)/lib/libnvpair/libnvpair.la \
 | ||||||
| 	$(top_builddir)/lib/libuutil/libuutil.la \
 | 	$(top_builddir)/lib/libuutil/libuutil.la \
 | ||||||
| 	$(top_builddir)/lib/libzpool/libzpool.la \
 | 	$(top_builddir)/lib/libzpool/libzpool.la \
 | ||||||
| 	$(top_builddir)/lib/libzfs/libzfs.la | 	$(top_builddir)/lib/libzfs/libzfs.la \
 | ||||||
|  | 	$(top_builddir)/lib/libzfs_core/libzfs_core.la | ||||||
| 
 | 
 | ||||||
| ztest_LDADD += -lm -ldl | ztest_LDADD += -lm -ldl | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Maximilian Mehnert
						Maximilian Mehnert