From 6f9b01873ee3c9e2be5daedc5b095a44d37a577c Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Tue, 9 Sep 2014 15:50:07 +0100 Subject: build: avoid name transformations on libstdbuf * src/local.mk (transform): Skip the transformation for libstdbuf since that should not be subject to name clashes, and we need to reference the name directly in LD_PRELOAD etc. * configure.ac: Add a comment on the coupling of pkglibexec_PROGRAMS to $(transform). Issue reported at https://trac.macports.org/ticket/44922 Improved by Nick Bowler --- src/local.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/local.mk b/src/local.mk index c0d04d680..0a6f217e0 100644 --- a/src/local.mk +++ b/src/local.mk @@ -336,11 +336,18 @@ copy_sources = \ src/extent-scan.c \ src/extent-scan.h +# Don't apply prefix transformations to libstdbuf shared lib +# as that's not generally needed, and we need to reference the +# name directly in LD_PRELOAD etc. In general it's surprising +# that $(transform) is applied to libexec at all given that is +# for internal package naming, not privy to $(transform). + # Use 'ginstall' in the definition of PROGRAMS and in dependencies to avoid # confusion with the 'install' target. The install rule transforms 'ginstall' # to install before applying any user-specified name transformations. -transform = s/ginstall/install/; $(program_transform_name) +transform = /libstdbuf/q;s/ginstall/install/;$(program_transform_name) + src_ginstall_SOURCES = src/install.c src/prog-fprintf.c $(copy_sources) \ $(selinux_sources) -- cgit v1.2.3-70-g09d2