Experimental Physics and
Industrial Control System

Bruce Hill has proposed merging ~bhill/epics-base:shared-rpath-independent-of-static-build into epics-base:7.0.

Commit message:
Shared lib rpath should not depend on whether or not static libs are also being built.

EPICS build system supports building both static and shared libs.
Useful for modules which might get used in both static and dynamically linked apps.
Without this fix shared libs only get rpath if LINKER_USE_RPATH=YES and STATIC_BUILD=NO.

Static builds don't pay any attention to rpath linker flags so no need to disable.

Requested reviews:
  EPICS Core Developers (epics-core)

For more details, see:
https://code.launchpad.net/~bhill/epics-base/+git/epics-base/+merge/373243
-- 
Your team EPICS Core Developers is requested to review the proposed merge of ~bhill/epics-base:shared-rpath-independent-of-static-build into epics-base:7.0.

diff --git a/configure/os/CONFIG.Common.linuxCommon b/configure/os/CONFIG.Common.linuxCommon
index 965de09..487d7f7 100644
--- a/configure/os/CONFIG.Common.linuxCommon
+++ b/configure/os/CONFIG.Common.linuxCommon
@@ -23,10 +23,10 @@ STATIC_LDFLAGS_YES= -Wl,-Bstatic
 STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 
-# Set runtime path for shared libraries if USE_RPATH=YES and STATIC_BUILD=NO
-SHRLIBDIR_RPATH_LDFLAGS_YES_NO = $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
+# Set runtime path for shared libraries if USE_RPATH=YES
+SHRLIBDIR_RPATH_LDFLAGS_YES = $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
 SHRLIBDIR_LDFLAGS += \
-    $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
+    $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
 
 # Set runtime path for products if USE_RPATH=YES and STATIC_BUILD=NO
 PRODDIR_RPATH_LDFLAGS_YES_NO = $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)

Replies:

Re: [Merge] ~bhill/epics-base:shared-rpath-independent-of-static-build into epics-base:7.0 rivers via Core-talk

Re: [Merge] ~bhill/epics-base:shared-rpath-independent-of-static-build into epics-base:7.0 rivers via Core-talk

Re: [Merge] ~bhill/epics-base:shared-rpath-independent-of-static-build into epics-base:7.0 mdavidsaver via Core-talk

Re: [Merge] ~bhill/epics-base:shared-rpath-independent-of-static-build into epics-base:7.0 mdavidsaver via Core-talk

Re: [Merge] ~bhill/epics-base:shared-rpath-independent-of-static-build into epics-base:7.0 rivers via Core-talk

Re: [Merge] ~bhill/epics-base:shared-rpath-independent-of-static-build into epics-base:7.0 mdavidsaver via Core-talk

Re: [Merge] ~bhill/epics-base:shared-rpath-independent-of-static-build into epics-base:7.0 rivers via Core-talk

Re: [Merge] ~bhill/epics-base:shared-rpath-independent-of-static-build into epics-base:7.0 Bruce Hill via Core-talk

Re: [Merge] ~bhill/epics-base:shared-rpath-independent-of-static-build into epics-base:7.0 Andrew Johnson via Core-talk

[Merge] ~bhill/epics-base:shared-rpath-independent-of-static-build into epics-base:7.0 Andrew Johnson via Core-talk

[Merge] ~bhill/epics-base:shared-rpath-independent-of-static-build into epics-base:7.0 noreply--- via Core-talk

Navigate by Date:

Prev: Jenkins build became unstable: epics-pva2pva-linux32 #148 APS Jenkins via Core-talk

Next: Build failed: epics-base base-7.0-314 AppVeyor via Core-talk

Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  <2019>  2020  2021  2022  2023  2024 

Navigate by Thread:

Prev: Jenkins build is back to stable : epics-pva2pva-linux32 #149 APS Jenkins via Core-talk

Next: Re: [Merge] ~bhill/epics-base:shared-rpath-independent-of-static-build into epics-base:7.0 rivers via Core-talk

Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  2018  <2019>  2020  2021  2022  2023  2024