Skip to content

Commit

Permalink
#1275: we must set rpath explicitly on Debian
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@13238 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Aug 6, 2016
1 parent b57a964 commit ab4e514
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
%:
dh $@ --with python2 --with quilt

BUILDOPTS= --with-Xdummy --without-Xdummy_wrapper --pkg-config-path=/usr/lib/xpra/pkgconfig
BUILDOPTS= --with-Xdummy --without-Xdummy_wrapper --pkg-config-path=/usr/lib/xpra/pkgconfig --rpath=/usr/lib/xpra/

override_dh_auto_build:
dh_auto_build -- $(BUILDOPTS)
Expand Down
8 changes: 8 additions & 0 deletions src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,16 @@ def is_msvc():
default_str = "auto-detect"
print("%s or %s (default: %s)" % (with_str.ljust(25), without_str.ljust(30), default_str))
print(" --pkg-config-path=PATH")
print(" --rpath=PATH")
sys.exit(0)

rpath = None
filtered_args = []
for arg in sys.argv:
if arg.startswith("--rpath="):
rpath = arg[len("--rpath="):]
print("rpath=%s" % rpath)
continue
matched = False
for x in SWITCHES:
with_str = "--with-%s" % x
Expand Down Expand Up @@ -716,6 +722,8 @@ def exec_pkgconfig(*pkgs_options, **ekw):
if get_gcc_version()>=[4, 8]:
add_to_keywords(kw, 'extra_compile_args', '-fsanitize=address')
add_to_keywords(kw, 'extra_link_args', '-fsanitize=address')
if rpath:
add_to_keywords(kw, "extra_link_args", "-Wl,-rpath=%s" % rpath)
#add_to_keywords(kw, 'include_dirs', '.')
if verbose_ENABLED:
print("exec_pkgconfig(%s,%s)=%s" % (pkgs_options, ekw, kw))
Expand Down

0 comments on commit ab4e514

Please sign in to comment.