Bug 648721 - Fix linking of xpcshell and plugin-container on OpenBSD. r=glandium
authorLandry Breuil <landry@openbsd.org>
Mon, 18 Apr 2011 12:15:37 +0200
changeset 68240 ea5232835539eecdac1ea82c96b8dfcaca047666
parent 68239 aada30c4e0d3ac8544dc850bdbb72da3ca94d794
child 68241 857ca6ae850293b1e2b5d146deed1ac3e30cc47a
push id19554
push usermlamouri@mozilla.com
push dateMon, 18 Apr 2011 15:18:04 +0000
treeherdermozilla-central@857ca6ae8502 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs648721
milestone6.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 648721 - Fix linking of xpcshell and plugin-container on OpenBSD. r=glandium
configure.in
--- a/configure.in
+++ b/configure.in
@@ -2621,17 +2621,18 @@ ia64*-hpux*)
 	case "${host_cpu}" in
 	i*86)
 	USE_ELF_DYNSTR_GC=1
 	;;
 	esac
 	;;
 
 *-openbsd*)
-    DLL_SUFFIX=".so.1.0"
+    DLL_SUFFIX='.so.$(if $(SO_VERSION),$(SO_VERSION),1.0)'
+    MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/X11R6)/lib'
     DSO_CFLAGS=''
     DSO_PIC_CFLAGS='-fPIC'
     DSO_LDOPTS='-shared -fPIC'
     if test "$LIBRUNPATH"; then
 	DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
     fi
     ;;