Patch "perf build: Fix library not found error when using CSLIBS" has been added to the 5.15-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    perf build: Fix library not found error when using CSLIBS

to the 5.15-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     perf-build-fix-library-not-found-error-when-using-cs.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 87c936a214ba46bb1429ffc8ea41a5fc504c6ace
Author: James Clark <james.clark@xxxxxxx>
Date:   Fri Jul 7 16:45:46 2023 +0100

    perf build: Fix library not found error when using CSLIBS
    
    [ Upstream commit 1feece2780ac2f8de45177fe53979726cee4b3d1 ]
    
    -L only specifies the search path for libraries directly provided in the
    link line with -l. Because -lopencsd isn't specified, it's only linked
    because it's a dependency of -lopencsd_c_api. Dependencies like this are
    resolved using the default system search paths or -rpath-link=... rather
    than -L. This means that compilation only works if OpenCSD is installed
    to the system rather than provided with the CSLIBS (-L) option.
    
    This could be fixed by adding -Wl,-rpath-link=$(CSLIBS) but that is less
    conventional than just adding -lopencsd to the link line so that it uses
    -L. -lopencsd seems to have been removed in commit ed17b1914978eddb
    ("perf tools: Drop requirement for libstdc++.so for libopencsd check")
    because it was thought that there was a chance compilation would work
    even if it didn't exist, but I think that only applies to libstdc++ so
    there is no harm to add it back. libopencsd.so and libopencsd_c_api.so
    would always exist together.
    
    Testing
    =======
    
    The following scenarios now all work:
    
     * Cross build with OpenCSD installed
     * Cross build using CSLIBS=...
     * Native build with OpenCSD installed
     * Native build using CSLIBS=...
     * Static cross build with OpenCSD installed
     * Static cross build with CSLIBS=...
    
    Committer testing:
    
      ⬢[acme@toolbox perf-tools]$ alias m
      alias m='make -k BUILD_BPF_SKEL=1 CORESIGHT=1 O=/tmp/build/perf-tools -C tools/perf install-bin && git status && perf test python ;  perf record -o /dev/null sleep 0.01 ; perf stat --null sleep 0.01'
      ⬢[acme@toolbox perf-tools]$ ldd ~/bin/perf | grep csd
            libopencsd_c_api.so.1 => /lib64/libopencsd_c_api.so.1 (0x00007fd49c44e000)
            libopencsd.so.1 => /lib64/libopencsd.so.1 (0x00007fd49bd56000)
      ⬢[acme@toolbox perf-tools]$ cat /etc/redhat-release
      Fedora release 36 (Thirty Six)
      ⬢[acme@toolbox perf-tools]$
    
    Fixes: ed17b1914978eddb ("perf tools: Drop requirement for libstdc++.so for libopencsd check")
    Reported-by: Radhey Shyam Pandey <radhey.shyam.pandey@xxxxxxx>
    Signed-off-by: James Clark <james.clark@xxxxxxx>
    Tested-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
    Tested-by: Radhey Shyam Pandey <radhey.shyam.pandey@xxxxxxx>
    Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
    Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
    Cc: Ian Rogers <irogers@xxxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxxxxx>
    Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
    Cc: Mark Rutland <mark.rutland@xxxxxxx>
    Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Uwe Kleine-König <uwe@xxxxxxxxxxxxxxxxx>
    Cc: coresight@xxxxxxxxxxxxxxxx
    Closes: https://lore.kernel.org/linux-arm-kernel/56905d7a-a91e-883a-b707-9d5f686ba5f1@xxxxxxx/
    Link: https://lore.kernel.org/all/36cc4dc6-bf4b-1093-1c0a-876e368af183@xxxxxxxxxxxxxxxxx/
    Link: https://lore.kernel.org/r/20230707154546.456720-1-james.clark@xxxxxxx
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index 2c30a2b577d3e..973c0d5ed8d8b 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -143,9 +143,9 @@ FEATURE_CHECK_LDFLAGS-libcrypto = -lcrypto
 ifdef CSINCLUDES
   LIBOPENCSD_CFLAGS := -I$(CSINCLUDES)
 endif
-OPENCSDLIBS := -lopencsd_c_api
+OPENCSDLIBS := -lopencsd_c_api -lopencsd
 ifeq ($(findstring -static,${LDFLAGS}),-static)
-  OPENCSDLIBS += -lopencsd -lstdc++
+  OPENCSDLIBS += -lstdc++
 endif
 ifdef CSLIBS
   LIBOPENCSD_LDFLAGS := -L$(CSLIBS)



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux