diff --git a/dev-libs/dbus_glib/dbus_glib-0.110.recipe b/dev-libs/dbus_glib/dbus_glib-0.110.recipe index d5e54cacc..b90d13fa3 100644 --- a/dev-libs/dbus_glib/dbus_glib-0.110.recipe +++ b/dev-libs/dbus_glib/dbus_glib-0.110.recipe @@ -4,7 +4,7 @@ HOMEPAGE="https://dbus.freedesktop.org/releases/dbus-glib/" COPYRIGHT="2003, 2004, 2005 Red Hat, Inc. 2005 Nokia" LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz" CHECKSUM_SHA256="7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825" SOURCE_DIR="dbus-glib-$portVersion" @@ -16,6 +16,13 @@ GLOBAL_WRITABLE_FILES=" settings/bash_completion.d/dbus-bash-completion.sh keep-old " +commandBinDir=$binDir +commandSuffix=$secondaryArchSuffix +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + libVersion="2.3.4" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" portVersionCompat="$portVersion compat >= ${portVersion%%.*}" @@ -23,7 +30,7 @@ portVersionCompat="$portVersion compat >= ${portVersion%%.*}" PROVIDES=" dbus_glib$secondaryArchSuffix = $portVersionCompat lib:libdbus_glib_1$secondaryArchSuffix = $libVersionCompat - cmd:dbus_binding_tool = $portVersion + cmd:dbus_binding_tool$commandSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix @@ -68,7 +75,9 @@ defineDebugInfoPackage dbus_glib$secondaryArchSuffix \ BUILD() { - LDFLAGS="-lnetwork" runConfigure ./configure + LDFLAGS="-lnetwork" runConfigure --omit-dirs binDir ./configure \ + --bindir=$commandBinDir \ + --disable-static make $jobArgs }