From ccd4bbe767debe9bac0a39ca98a887951ee19133 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 17 Jul 2010 08:25:26 +0000 Subject: [PATCH] 2010-07-17 10:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/vxworks/gcc.mk * config/vxworks/diab.mk + Setting 'soname'. It's mandatory according to VxWorks docs. Now shared diab exes will find Harbour dynlib (but not the libc one, but I reckon this needs local env tweaks only). --- harbour/ChangeLog | 7 +++++++ harbour/config/vxworks/diab.mk | 2 +- harbour/config/vxworks/gcc.mk | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4256bb10f2..9b8820bd9e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-17 10:24 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/vxworks/gcc.mk + * config/vxworks/diab.mk + + Setting 'soname'. It's mandatory according to VxWorks docs. + Now shared diab exes will find Harbour dynlib (but not the + libc one, but I reckon this needs local env tweaks only). + 2010-07-17 09:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL * utils/hbmk2/hbmk2.prg diff --git a/harbour/config/vxworks/diab.mk b/harbour/config/vxworks/diab.mk index eb212380e5..cf624b159d 100644 --- a/harbour/config/vxworks/diab.mk +++ b/harbour/config/vxworks/diab.mk @@ -100,7 +100,7 @@ endef define create_dynlib $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,) $(foreach file,$^,$(dynlib_object)) - $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ -@__dyn__.tmp $(DLIBS) $(DYSTRIP) + $(DY) $(DFLAGS) -soname="$(LIB_PREF)$(DYNNAME2)-$(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE)$(DYN_EXT)" $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ -@__dyn__.tmp $(DLIBS) $(DYSTRIP) endef DY_RULE = $(create_dynlib) diff --git a/harbour/config/vxworks/gcc.mk b/harbour/config/vxworks/gcc.mk index de7d356b3d..fb493c719e 100644 --- a/harbour/config/vxworks/gcc.mk +++ b/harbour/config/vxworks/gcc.mk @@ -76,7 +76,7 @@ endef define create_dynlib $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,) $(foreach file,$^,$(dynlib_object)) - $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ __dyn__.tmp $(DLIBS) $(DYSTRIP) + $(DY) $(DFLAGS) -Wl,-soname,"$(LIB_PREF)$(DYNNAME2)-$(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE)$(DYN_EXT)" $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ __dyn__.tmp $(DLIBS) $(DYSTRIP) endef DY_RULE = $(create_dynlib)