rpm/bluez
SHA256
1
0
Fork 0
forked from pool/bluez
Code Pull Requests Activity

Accepting request 556306 from home:seife:testing

Browse Source 
add 0001-obexd-use-AM_LDFLAGS-for-linking.patch

OBS-URL: https://build.opensuse.org/request/show/556306
OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=237
This commit is contained in:
Stefan Seyfried 2017-12-11 22:13:07 +00:00 committed by Git OBS Bridge
parent 4185db8c86
commit 71a4de34de
3 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0001-obexd-use-AM_LDFLAGS-for-linking.patch Normal file
View File

@ -0,0 +1,26 @@
From b912306ae756eaf75caa1ab7e04e3112fac4a01c Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife+dev@b1-systems.com>
Date: Mon, 11 Dec 2017 22:52:28 +0100
Subject: [PATCH] obexd: use AM_LDFLAGS for linking
without this, --enable-pie does not work for obexd
---
Makefile.obexd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.obexd b/Makefile.obexd
index 2e33cbc72..86c395305 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -83,7 +83,7 @@ obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \
gdbus/libgdbus-internal.la \
@ICAL_LIBS@ @DBUS_LIBS@ @GLIB_LIBS@ -ldl
-obexd_src_obexd_LDFLAGS = -Wl,--export-dynamic
+obexd_src_obexd_LDFLAGS = $(AM_LDFLAGS) -Wl,--export-dynamic
obexd_src_obexd_CFLAGS = $(AM_CFLAGS) @GLIB_CFLAGS@ @DBUS_CFLAGS@ \
@ICAL_CFLAGS@ -DOBEX_PLUGIN_BUILTIN \
--
2.15.1

6
bluez.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Dec 11 21:54:32 UTC 2017 - seife+obs@b1-systems.com
- add 0001-obexd-use-AM_LDFLAGS-for-linking.patch
- avoid systemd dependency during %post
-------------------------------------------------------------------
Sun Sep 17 22:34:07 UTC 2017 - seife+obs@b1-systems.com

9
bluez.spec
View File

@ -34,6 +34,8 @@ Patch2: bluez-sdp-unix-path.patch
Patch3: bluez-cups-libexec.patch
# workaround for broken tests (reported upstream but not yet fixed)
Patch4: bluez-5.45-disable-broken-tests.diff
# PATCH-FIX-UPSTREAM: obexd not compiled with -fpie -- seife+obs@b1-systems.com
Patch5: 0001-obexd-use-AM_LDFLAGS-for-linking.patch
BuildRequires: automake
BuildRequires: flex
BuildRequires: libtool
@ -51,6 +53,7 @@ BuildRequires: pkgconfig(libical)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(sndfile)
BuildRequires: pkgconfig(udev)
Requires(post): coreutils
Recommends: sbc
Provides: bluez-utils = 3.36
Obsoletes: bluez-utils <= 3.36
@ -136,6 +139,7 @@ desktop specific applets like blueman or GNOME or KDE applets).
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
mkdir dbus-apis
cp -a doc/*.txt dbus-apis/
# FIXME: Change the dbus service to be a real service, not systemd launched
@ -207,8 +211,9 @@ make check V=0
%{fillup_only -n bluetooth}
# We need the bluez systemd service enabled at any time. It won't start up
# on it's own, as it is triggered by udev in the end (bnc#796671)
/bin/systemctl enable bluetooth.service 2>&1 || :
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
install -d /etc/systemd/system/bluetooth.target.wants
ln -sf /usr/lib/systemd/system/bluetooth.service /etc/systemd/system/bluetooth.target.wants/bluetooth.service
ln -sf /usr/lib/systemd/system/bluetooth.service /etc/systemd/system/dbus-org.bluez.service
%preun
%service_del_preun bluetooth.service