add static_libs bcond

[packages/xfsprogs.git] / xfsprogs-miscfix-v2.patch

diff --git a/xfsprogs-miscfix-v2.patch b/xfsprogs-miscfix-v2.patch
index 20d8f10bb0e830a25cd53e51adb4ac14e8dc85b6..3a4296b5c4b934c6dedcdf2458fc3e43346ac5dc 100644 (file)
--- a/xfsprogs-miscfix-v2.patch
+++ b/xfsprogs-miscfix-v2.patch
@@ -1,7 +1,20 @@
---- xfsprogs-2.5.4/m4/manual_format.m4.orig    2003-07-25 19:42:03.000000000 +0200
-+++ xfsprogs-2.5.4/m4/manual_format.m4 2003-08-08 08:22:59.000000000 +0200
+diff -urNp -x '*.orig' xfsprogs-5.11.0.org/libxfs/Makefile xfsprogs-5.11.0/libxfs/Makefile
+--- xfsprogs-5.11.0.org/libxfs/Makefile        2020-12-23 02:12:40.000000000 +0100
++++ xfsprogs-5.11.0/libxfs/Makefile    2021-03-14 00:46:57.929250648 +0100
+@@ -110,7 +110,7 @@ CFILES = cache.c \
+ 
+ FCFLAGS = -I.
+ 
+-LTLIBS = $(LIBPTHREAD) $(LIBRT)
++LTLIBS = $(LIBPTHREAD) $(LIBRT) $(LIBUUID)
+ 
+ # don't try linking xfs_repair with a debug libxfs.
+ DEBUG = -DNDEBUG
+diff -urNp -x '*.orig' xfsprogs-5.11.0.org/m4/manual_format.m4 xfsprogs-5.11.0/m4/manual_format.m4
+--- xfsprogs-5.11.0.org/m4/manual_format.m4    2020-12-23 02:07:48.000000000 +0100
++++ xfsprogs-5.11.0/m4/manual_format.m4        2021-03-14 00:46:57.929250648 +0100
 @@ -6,12 +6,5 @@
- # 
+ #
  AC_DEFUN([AC_MANUAL_FORMAT],
    [ have_zipped_manpages=false
 -    for d in ${prefix}/share/man ${prefix}/man ; do
@@ -13,15 +26,3 @@
 -    done
      AC_SUBST(have_zipped_manpages)
    ])
-
---- xfsprogs-3.2.0/libxfs/Makefile~    2014-01-28 07:19:44.000000000 +0100
-+++ xfsprogs-3.2.0/libxfs/Makefile     2014-05-17 20:01:36.257560519 +0200
-@@ -56,7 +56,7 @@
- 
- FCFLAGS = -I.
- 
--LTLIBS = $(LIBPTHREAD) $(LIBRT)
-+LTLIBS = $(LIBPTHREAD) $(LIBRT) $(LIBUUID)
- 
- # don't try linking xfs_repair with a debug libxfs.
- DEBUG = -DNDEBUG