luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-12 20:36:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: Include $host_cpu in tapset directory

Browse Source 
SystemTap tapsets are architecture-specific, as they include the full
path to the .so file for each probe they reference. Hence, we should
install them in an architecture-specific path, or multiarch systems will
suffer from collisions between them.

A better long-term solution, using $libdir rather than the
non-architecture-specific $datadir, is under discussion upstream:
https://sourceware.org/bugzilla/show_bug.cgi?id=20264; but this will do
for now.

https://bugzilla.gnome.org/show_bug.cgi?id=662802
This commit is contained in:
Philip Withnall 2016-06-29 14:59:59 +01:00 committed by Philip Withnall
parent 748bb24985
commit 030efac077
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -2554,13 +2554,13 @@ AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$have_systemtap = xyes])
AC_ARG_WITH([tapset-install-dir], AC_ARG_WITH([tapset-install-dir],
AS_HELP_STRING([--with-tapset-install-dir=DIR], AS_HELP_STRING([--with-tapset-install-dir=DIR],
[path where systemtap tapsets are installed [DATADIR/systemtap/tapset]]), [path where systemtap tapsets are installed [DATADIR/systemtap/tapset/HOST_CPU]]),
[if test "x${withval}" = x; then [if test "x${withval}" = x; then
ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset" ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset/${host_cpu}"
else else
ABS_TAPSET_DIR="${withval}" ABS_TAPSET_DIR="${withval}"
fi], fi],
[ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"]) [ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset/${host_cpu}"])
AC_SUBST(ABS_TAPSET_DIR) AC_SUBST(ABS_TAPSET_DIR)
dnl ************************************ dnl ************************************