提交 c199837c 编写于 作者: R Richard Levitte

Fix inconsistencies in the Darwin targets.

Add a variant of SHLIB_SOVER without the preceding period.
上级 83699c47
...@@ -64,6 +64,7 @@ CALC_VERSIONS= \ ...@@ -64,6 +64,7 @@ CALC_VERSIONS= \
if [ -n "$(LIBVERSION) $(LIBCOMPATVERSIONS)" ]; then \ if [ -n "$(LIBVERSION) $(LIBCOMPATVERSIONS)" ]; then \
prev=""; \ prev=""; \
for v in `echo "$(LIBVERSION) $(LIBCOMPATVERSIONS)" | cut -d';' -f1`; do \ for v in `echo "$(LIBVERSION) $(LIBCOMPATVERSIONS)" | cut -d';' -f1`; do \
SHLIB_SOVER_NODOT=$$v \
SHLIB_SOVER=.$$v; \ SHLIB_SOVER=.$$v; \
if [ -n "$$prev" ]; then \ if [ -n "$$prev" ]; then \
SHLIB_COMPAT=$$SHLIB_COMPAT .$$prev; \ SHLIB_COMPAT=$$SHLIB_COMPAT .$$prev; \
...@@ -133,17 +134,17 @@ link_o.darwin: ...@@ -133,17 +134,17 @@ link_o.darwin:
LIBDEPS="$(LIBDEPS)" \ LIBDEPS="$(LIBDEPS)" \
ALLSYMSFLAGS='-all_load' \ ALLSYMSFLAGS='-all_load' \
NOALLSYMSFLAGS='' \ NOALLSYMSFLAGS='' \
SHAREDFLAGS="-current_version $(LIBVERSION) -compatibility_version $$SHLIB_SOVER" \ SHAREDFLAGS="-dynamiclib -current_version $(LIBVERSION) -compatibility_version $$SHLIB_SOVER_NODOT" \
SHAREDCMD='$(CC)'; \ SHAREDCMD='$(CC)'; \
$(LINK_SO_O) $(LINK_SO_O)
link_a.darwin: link_a.darwin:
@ $(CALC_VERSIONS); \ @ $(CALC_VERSIONS); \
SHLIB=lib$(LIBNAME)$$SHLIB_SOVER.dylib \ SHLIB=lib$(LIBNAME) \
SHLIB_SUFFIX=.dylib \ SHLIB_SUFFIX=.dylib \
LIBDEPS="$(LIBDEPS)" \ LIBDEPS="$(LIBDEPS)" \
ALLSYMSFLAGS='-all_load' \ ALLSYMSFLAGS='-all_load' \
NOALLSYMSFLAGS='' \ NOALLSYMSFLAGS='' \
SHAREDFLAGS="-dynamiclib -current_version $(LIBVERSION) -compatibility_version $$SHLIB_SOVER" \ SHAREDFLAGS="-dynamiclib -current_version $(LIBVERSION) -compatibility_version $$SHLIB_SOVER_NODOT" \
SHAREDCMD='$(CC)'; \ SHAREDCMD='$(CC)'; \
$(LINK_SO_A) $(LINK_SO_A)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册