diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-06-06 17:07:28 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-06-06 17:07:28 +0000 |
| commit | c785c5c564b10230a51d22f26d11ae75358ed0f1 (patch) | |
| tree | 12b68fb3eea439f0d76bbb68d8d277cad44d4a41 | |
| parent | e2f946ee2440a0669b4d72b6ff91b7867db7e063 (diff) | |
| download | ATCD-c785c5c564b10230a51d22f26d11ae75358ed0f1.tar.gz | |
Thu Jun 6 17:02:06 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
* include/makeinclude/rules.lib.GNU:
The rule for generating versioned_so=2 style libraries would create
names such as "-6.2.0.so" in cases where the SHLIB was reset to empty,
for instance if a precondition isn't met. As an example, ACE_TkReactor
should skip the build if macro tk=1 isn't set. but with versioned_so=2
the VSHLIB target was non-empty so the build was attempted. Now the
VSHLIB and related targets are modified only if the source libname
is not empty.
| -rw-r--r-- | ACE/ChangeLog | 12 | ||||
| -rw-r--r-- | ACE/include/makeinclude/rules.lib.GNU | 8 |
2 files changed, 16 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 208b7d42f12..fc008946296 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,15 @@ +Thu Jun 6 17:02:06 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * include/makeinclude/rules.lib.GNU: + + The rule for generating versioned_so=2 style libraries would create + names such as "-6.2.0.so" in cases where the SHLIB was reset to empty, + for instance if a precondition isn't met. As an example, ACE_TkReactor + should skip the build if macro tk=1 isn't set. but with versioned_so=2 + the VSHLIB target was non-empty so the build was attempted. Now the + VSHLIB and related targets are modified only if the source libname + is not empty. + Wed Jun 5 20:09:59 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * tests/FlReactor_Test.cpp: diff --git a/ACE/include/makeinclude/rules.lib.GNU b/ACE/include/makeinclude/rules.lib.GNU index f1269e63d52..77f6b862268 100644 --- a/ACE/include/makeinclude/rules.lib.GNU +++ b/ACE/include/makeinclude/rules.lib.GNU @@ -36,7 +36,7 @@ ifneq ($(versioned_so),0) ifeq ($(SONAME),) ifeq ($(versioned_so),1) SONAME = $(SHLIB)$(SOVERSION) - else + else ifeq ($(versioned_so),2) SONAME = $(patsubst %.$(SOEXT),%,$(SHLIB))$(SOVERSION).$(SOEXT) endif @@ -66,9 +66,9 @@ ifneq ($(versioned_so),2) CLEANUP_VSHLIB = $(CLEANUP_VSHLIB_NO_VER:%=%$(SOVERSION)) SHLIB_WITH_VER = $(SHLIB:%=%$(SOVERSION)) else - VSHLIB = $(patsubst %.$(SOEXT),%,$(VSHLIB_NO_VER))$(SOVERSION).$(SOEXT) - CLEANUP_VSHLIB = $(patsubst %.$(SOEXT),%,$(CLEANUP_VSHLIB_NO_VER))$(SOVERSION).$(SOEXT) - SHLIB_WITH_VER = $(patsubst %.$(SOEXT),%,$(SHLIB))$(SOVERSION).$(SOEXT) + VSHLIB = $(if $(VSHLIB_NO_VER), $(patsubst %.$(SOEXT),%,$(VSHLIB_NO_VER))$(SOVERSION).$(SOEXT)) + CLEANUP_VSHLIB = $(if $(CLEANUP_VSHLIB_NO_VER), $(patsubst %.$(SOEXT),%,$(CLEANUP_VSHLIB_NO_VER))$(SOVERSION).$(SOEXT)) + SHLIB_WITH_VER = $(if $(SHLIB), $(patsubst %.$(SOEXT),%,$(SHLIB))$(SOVERSION).$(SOEXT)) endif SHLIBA ?= |