bug-gnulib@gnu.org mirror (unofficial)
 help / color / mirror / Atom feed
From: Bruno Haible <bruno@clisp.org>
To: bug-gnulib@gnu.org,
	Ondrej Valousek <ondrej.valousek.xm@renesas.com>,
	Paul Eggert <eggert@cs.ucla.edu>
Subject: Re: [PATCH] Use xattr (Linux) in qcopy-acl.c
Date: Fri, 13 Jan 2023 09:33:49 +0100	[thread overview]
Message-ID: <7698295.mr9Zh2SJbS@nimes> (raw)
In-Reply-To: <dd8b3799-dc4f-90fb-433f-e3bdc10b8e4d@cs.ucla.edu>

Paul Eggert wrote:
> Sure, as long as the linker dependencies are fixed soon we'll be OK.

The linker dependencies are fixed through this patch. It was only a
matter of
1) going through all reverse module dependencies,
2) building a testdir of these modules with --enable-xattr and looking
   out for link errors.


2023-01-13  Bruno Haible  <bruno@clisp.org>

	qcopy-acl: Adjust link dependencies.
	* modules/qcopy-acl (Depends-on): Add condition.
	(configure.ac): Set QCOPY_ACL_LIB.
	(Link): Add $(QCOPY_ACL_LIB). Remove $(LIB_ACL).
	* modules/qacl (Link): Add $(LIB_ACL) and $(QCOPY_ACL_LIB).
	* modules/acl (Link): Add $(LIB_ACL) and $(QCOPY_ACL_LIB).
	* modules/copy-file (Link): Add $(QCOPY_ACL_LIB).
	* modules/supersede (Link): Add $(QCOPY_ACL_LIB).
	* modules/acl-tests (Makefile.am): Link test-copy-acl with
	$(QCOPY_ACL_LIB).
	* modules/copy-file-tests (Makefile.am): Link test-copy-file with
	$(QCOPY_ACL_LIB).
	* modules/supersede-tests (Makefile.am): Link test-supersede with
	$(QCOPY_ACL_LIB).

diff --git a/modules/acl b/modules/acl
index 8bcfd99420..bcc1f4906c 100644
--- a/modules/acl
+++ b/modules/acl
@@ -22,6 +22,8 @@ Include:
 
 Link:
 $(MBRTOWC_LIB)
+$(LIB_ACL)
+$(QCOPY_ACL_LIB)
 
 License:
 GPL
diff --git a/modules/acl-tests b/modules/acl-tests
index 44190b607d..2ee34c6523 100644
--- a/modules/acl-tests
+++ b/modules/acl-tests
@@ -26,5 +26,5 @@ TESTS += \
 TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
 check_PROGRAMS += test-set-mode-acl test-copy-acl test-sameacls
 test_set_mode_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(MBRTOWC_LIB)
-test_copy_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(MBRTOWC_LIB)
+test_copy_acl_LDADD = $(LDADD) $(LIB_ACL) $(QCOPY_ACL_LIB) @LIBINTL@ $(MBRTOWC_LIB)
 test_sameacls_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(MBRTOWC_LIB)
diff --git a/modules/copy-file b/modules/copy-file
index dac8bd6358..a73e2a474c 100644
--- a/modules/copy-file
+++ b/modules/copy-file
@@ -37,6 +37,7 @@ Include:
 
 Link:
 $(LIB_ACL)
+$(QCOPY_ACL_LIB)
 $(MBRTOWC_LIB)
 
 License:
diff --git a/modules/copy-file-tests b/modules/copy-file-tests
index 1c554696f9..087797c727 100644
--- a/modules/copy-file-tests
+++ b/modules/copy-file-tests
@@ -18,4 +18,4 @@ Makefile.am:
 TESTS += test-copy-file.sh test-copy-file-1.sh test-copy-file-2.sh
 TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
 check_PROGRAMS += test-copy-file
-test_copy_file_LDADD = $(LDADD) $(LIB_ACL) $(CLOCK_TIME_LIB) @LIBINTL@ $(MBRTOWC_LIB)
+test_copy_file_LDADD = $(LDADD) $(LIB_ACL) $(QCOPY_ACL_LIB) $(CLOCK_TIME_LIB) @LIBINTL@ $(MBRTOWC_LIB)
diff --git a/modules/qacl b/modules/qacl
index 45753c7623..445f639f7b 100644
--- a/modules/qacl
+++ b/modules/qacl
@@ -15,6 +15,10 @@ Makefile.am:
 
 Include:
 
+Link:
+$(LIB_ACL)
+$(QCOPY_ACL_LIB)
+
 License:
 GPL
 
diff --git a/modules/qcopy-acl b/modules/qcopy-acl
index e0cd914953..8dd147927d 100644
--- a/modules/qcopy-acl
+++ b/modules/qcopy-acl
@@ -6,10 +6,16 @@ lib/qcopy-acl.c
 m4/xattr.m4
 
 Depends-on:
-acl-permissions
+acl-permissions [test "$use_xattr" != yes]
 
 configure.ac:
 gl_FUNC_XATTR
+if test "$use_xattr" = yes; then
+  QCOPY_ACL_LIB="$LIB_XATTR"
+else
+  QCOPY_ACL_LIB="$LIB_ACL"
+fi
+AC_SUBST([QCOPY_ACL_LIB])
 
 Makefile.am:
 lib_SOURCES += qcopy-acl.c
@@ -18,7 +24,7 @@ Include:
 "acl.h"
 
 Link:
-$(LIB_ACL)
+$(QCOPY_ACL_LIB)
 
 License:
 GPL
diff --git a/modules/supersede b/modules/supersede
index 3118fad426..1f434fe221 100644
--- a/modules/supersede
+++ b/modules/supersede
@@ -36,6 +36,7 @@ Include:
 
 Link:
 $(LIB_ACL)
+$(QCOPY_ACL_LIB)
 $(GETRANDOM_LIB)
 $(CLOCK_TIME_LIB)
 $(LIBTHREAD)
diff --git a/modules/supersede-tests b/modules/supersede-tests
index f3a9d777d9..d4b0566b0d 100644
--- a/modules/supersede-tests
+++ b/modules/supersede-tests
@@ -19,4 +19,4 @@ configure.ac:
 Makefile.am:
 TESTS += test-supersede
 check_PROGRAMS += test-supersede
-test_supersede_LDADD = $(LDADD) $(LIB_ACL) $(CLOCK_TIME_LIB) $(GETRANDOM_LIB) $(LIBINTL) $(LIBTHREAD)
+test_supersede_LDADD = $(LDADD) $(LIB_ACL) $(QCOPY_ACL_LIB) $(CLOCK_TIME_LIB) $(GETRANDOM_LIB) $(LIBINTL) $(LIBTHREAD)





  parent reply	other threads:[~2023-01-13  8:34 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-04 14:34 [PATCH] Use xattr (Linux) in qcopy-acl.c Ondrej Valousek
2023-01-04 14:46 ` Bruno Haible
2023-01-04 19:29   ` Paul Eggert
2023-01-04 20:54     ` Ondrej Valousek
2023-01-05  1:19       ` Paul Eggert
2023-01-13  9:15         ` ACL complexity Bruno Haible
2023-01-13 10:03           ` Ondrej Valousek
2023-01-13 11:05             ` Bruno Haible
2023-01-13 11:22               ` Ondrej Valousek
2023-01-05  9:00       ` [PATCH] Use xattr (Linux) in qcopy-acl.c Bruno Haible
2023-01-05  9:05         ` Ondrej Valousek
2023-01-05 10:32           ` Bruno Haible
2023-01-05 19:06             ` Paul Eggert
2023-01-11  9:11               ` Ondrej Valousek
2023-01-12 20:42                 ` Bruno Haible
2023-01-13  7:51                   ` Bruno Haible
2023-01-13  8:09                     ` Bruno Haible
2023-01-13  8:32                       ` Ondrej Valousek
2023-01-13  8:46                         ` Bruno Haible
2023-01-14  1:52                           ` Paul Eggert
2023-01-14  7:26                             ` Ondrej Valousek
2023-01-14  7:55                               ` Bruno Haible
2023-01-14  8:02                                 ` Ondrej Valousek
2023-01-13  8:33               ` Bruno Haible [this message]
2023-01-13  8:50                 ` Bruno Haible
2023-01-30 10:18                 ` Bruno Haible
2023-01-05  8:56     ` Bruno Haible
     [not found] ` <TYXPR01MB18544D0A5C213BF0204BF0D4D9FD9@TYXPR01MB1854.jpnprd01.prod.outlook.com>
     [not found]   ` <c1ddff8c-2734-bfa1-11a3-3279ae9e92cb@cs.ucla.edu>
2023-01-12 20:58     ` Bruno Haible
2023-01-12 22:53       ` Paul Eggert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://lists.gnu.org/mailman/listinfo/bug-gnulib

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7698295.mr9Zh2SJbS@nimes \
    --to=bruno@clisp.org \
    --cc=bug-gnulib@gnu.org \
    --cc=eggert@cs.ucla.edu \
    --cc=ondrej.valousek.xm@renesas.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).