|
 |
93c737f |
From b78bd8b88b92962d5f84b344828293d82d20f7ff Mon Sep 17 00:00:00 2001
|
|
|
c64b328 |
From: Jakub Filak <jfilak@redhat.com>
|
|
|
c64b328 |
Date: Thu, 30 Oct 2014 08:36:56 +0100
|
|
|
cf17376 |
Subject: [PATCH 3/6] Use architecture-independent location of
|
|
|
c64b328 |
abrt-java-connector
|
|
|
c64b328 |
|
|
|
c64b328 |
The connector's library has been moved to architecture-independent
|
|
|
c64b328 |
directory /usr/lib/abrt-java-connector/, because Java does not
|
|
|
c64b328 |
officially support multilib and having the connector installed the arch
|
|
|
c64b328 |
specific directory was causing us problems if Java package doesn't match
|
|
|
c64b328 |
host architecture (e.g. Java i386 on host x86_64).
|
|
|
c64b328 |
|
|
|
c64b328 |
Signed-off-by: Jakub Filak <jfilak@redhat.com>
|
|
|
c64b328 |
---
|
|
|
c64b328 |
build | 1 +
|
|
|
c64b328 |
configure | 2 ++
|
|
|
c64b328 |
java-utils/java-functions | 4 ++--
|
|
|
c64b328 |
3 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
c64b328 |
|
|
|
c64b328 |
diff --git a/build b/build
|
|
|
c64b328 |
index eda0717..05e5d0a 100755
|
|
|
c64b328 |
--- a/build
|
|
|
c64b328 |
+++ b/build
|
|
|
c64b328 |
@@ -64,6 +64,7 @@ expand()
|
|
|
c64b328 |
-e "s|%{prefix}|${prefix}|" \
|
|
|
c64b328 |
-e "s|%{rundir}|${rundir}|" \
|
|
|
c64b328 |
-e "s|%{sysconfdir}|${sysconfdir}|" \
|
|
|
c64b328 |
+ -e "s|%{abrtlibdir}|${abrtlibdir}|" \
|
|
|
c64b328 |
"${1}" >"${target}"
|
|
|
c64b328 |
}
|
|
|
c64b328 |
|
|
|
c64b328 |
diff --git a/configure b/configure
|
|
|
93c737f |
index fca8a5f..b6797db 100755
|
|
|
c64b328 |
--- a/configure
|
|
|
c64b328 |
+++ b/configure
|
|
|
c64b328 |
@@ -59,6 +59,7 @@ jvmlibdir
|
|
|
c64b328 |
jvmprivdir
|
|
|
c64b328 |
jvmsysconfdir
|
|
|
c64b328 |
mavenpomdir
|
|
|
c64b328 |
+abrtlibdir
|
|
|
c64b328 |
"
|
|
|
c64b328 |
|
|
|
c64b328 |
vars="$vars mavendepmapdir mavendepmapfragdir" # @Deprecated
|
|
|
c64b328 |
@@ -79,6 +80,7 @@ test -z "${sysconfdir}" && sysconfdir="${prefix}/etc"
|
|
|
c64b328 |
test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
|
|
|
c64b328 |
|
|
|
c64b328 |
test -z "${m2home}" && m2home="${datadir}/xmvn"
|
|
|
93c737f |
+test -z "${abrtlibdir}" && abrtlibdir="${prefix}/lib/abrt-java-connector"
|
|
|
c64b328 |
|
|
|
c64b328 |
eval $(sed -n 's/^%_\('"$vars_re"'\)\ *\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' macros.d/macros.jpackage)
|
|
|
c64b328 |
|
|
|
c64b328 |
diff --git a/java-utils/java-functions b/java-utils/java-functions
|
|
|
c64b328 |
index c57640f..8397d2c 100644
|
|
|
c64b328 |
--- a/java-utils/java-functions
|
|
|
c64b328 |
+++ b/java-utils/java-functions
|
|
|
c64b328 |
@@ -110,8 +110,8 @@ _load_java_conf()
|
|
|
c64b328 |
JAVACMD_OPTS="${java_opts_save}"
|
|
|
c64b328 |
fi
|
|
|
c64b328 |
|
|
|
c64b328 |
- if [ "_${JAVA_ABRT}" != "_off" ] && [ -f %{libdir}/libabrt-java-connector.so ] && [ -f %{rundir}/abrt/abrtd.pid ]; then
|
|
|
c64b328 |
- JAVACMD_OPTS="${JAVACMD_OPTS} -agentpath:%{libdir}/libabrt-java-connector.so=abrt=on"
|
|
|
c64b328 |
+ if [ "_${JAVA_ABRT}" != "_off" ] && [ -f %{abrtlibdir}/libabrt-java-connector.so ] && [ -f %{rundir}/abrt/abrtd.pid ]; then
|
|
|
c64b328 |
+ JAVACMD_OPTS="${JAVACMD_OPTS} -agentpath:%{abrtlibdir}/libabrt-java-connector.so=abrt=on"
|
|
|
c64b328 |
fi
|
|
|
c64b328 |
}
|
|
|
c64b328 |
|
|
|
c64b328 |
--
|
|
|
c64b328 |
1.9.3
|
|
|
c64b328 |
|