diff options
| author | Michael Tretter <m.tretter@pengutronix.de> | 2020-10-16 14:40:40 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-10-28 08:19:06 +0100 |
| commit | 15a49614268a10c0d5a970a76a403ef9366ee57e (patch) | |
| tree | eb934cd67ec7406201911a623cb7b0d51c73a2a3 /patches | |
| parent | d2f146f4a279522ebd7ec6541a24ae7f8d6b34ca (diff) | |
| download | ptxdist-15a49614268a10c0d5a970a76a403ef9366ee57e.tar.gz ptxdist-15a49614268a10c0d5a970a76a403ef9366ee57e.tar.xz | |
apitrace: new package
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
Message-Id: <20201016124040.3353782-1-m.tretter@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/apitrace-9.0/0001-Use-CMAKE_INSTALL_LIBDIR-for-LIB_INSTALL_DIR.patch | 49 | ||||
| -rw-r--r-- | patches/apitrace-9.0/series | 4 |
2 files changed, 53 insertions, 0 deletions
diff --git a/patches/apitrace-9.0/0001-Use-CMAKE_INSTALL_LIBDIR-for-LIB_INSTALL_DIR.patch b/patches/apitrace-9.0/0001-Use-CMAKE_INSTALL_LIBDIR-for-LIB_INSTALL_DIR.patch new file mode 100644 index 000000000..f2bf4d46b --- /dev/null +++ b/patches/apitrace-9.0/0001-Use-CMAKE_INSTALL_LIBDIR-for-LIB_INSTALL_DIR.patch @@ -0,0 +1,49 @@ +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 29 Apr 2019 20:32:04 +0200 +Subject: [PATCH] Use CMAKE_INSTALL_LIBDIR for LIB_INSTALL_DIR + +Respect the libdir cmake already set up for us instead of using +debian-specific multiarch paths. + +Patch was rebased multiple times from 4.0 to 9.0 now. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 17 ++--------------- + 1 file changed, 2 insertions(+), 15 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 19316e604286..6c3c4b85c19c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -438,15 +438,6 @@ endif () + ############################################################################## + # Installation directories + +-if (CMAKE_SYSTEM_NAME STREQUAL "Linux") +- # Debian multiarch support +- execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH +- OUTPUT_VARIABLE ARCH_SUBDIR +- ERROR_QUIET +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ) +-endif() +- + if (WIN32 OR APPLE) + # On Windows/MacOSX, applications are usually installed on a directory of + # their own +@@ -455,12 +446,8 @@ if (WIN32 OR APPLE) + set (LIB_ARCH_INSTALL_DIR lib) + else () + set (DOC_DEFAULT_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME}) +- set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME}) +- if (ARCH_SUBDIR) +- set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME}) +- else () +- set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME}) +- endif () ++ set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME}) ++ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR}) + endif () + + # Allow customization of the doc installation dir (Slackware uses different diff --git a/patches/apitrace-9.0/series b/patches/apitrace-9.0/series new file mode 100644 index 000000000..c75669299 --- /dev/null +++ b/patches/apitrace-9.0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Use-CMAKE_INSTALL_LIBDIR-for-LIB_INSTALL_DIR.patch +# e6b6e6297e24d182be6d8261d1509250 - git-ptx-patches magic |