From 76eb4a7412b0728435cdcffaaf75074f8b4341a2 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 23 Feb 2011 09:58:51 +0000
Subject: [PATCH] 2011-02-23 10:58 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * config/linux/sunpro.mk   * config/sunos/gcc.mk   *
 config/sunos/sunpro.mk     + adjust dt_soname generation for sun toolchain
 [Tamas]

  * contrib/hbpost.hbm
    + Added soname support for sunos. Pls test.

  * config/global.mk
    * Minor.
---
 harbour/ChangeLog              | 12 ++++++++++++
 harbour/config/global.mk       |  2 +-
 harbour/config/linux/sunpro.mk |  2 +-
 harbour/config/sunos/gcc.mk    |  2 +-
 harbour/config/sunos/sunpro.mk |  2 +-
 harbour/contrib/hbpost.hbm     |  1 +
 6 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ff21167b45..dce55dcf49 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,18 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-23 10:58 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * config/linux/sunpro.mk
+  * config/sunos/gcc.mk
+  * config/sunos/sunpro.mk
+    + adjust dt_soname generation for sun toolchain [Tamas]
+
+  * contrib/hbpost.hbm
+    + Added soname support for sunos. Pls test.
+
+  * config/global.mk
+    * Minor.
+
 2011-02-23 02:09 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbexpat/hbexpat.hbp
     ! Fixed to not disable detection of local copy when
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 4a97619917..4b2f6130af 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -1747,9 +1747,9 @@ endif
 ifeq ($(HB_INIT_DONE),)
    ifneq ($(HB_BUILD_DYN),no)
 
+      HB_DYNLIB_PLOC :=
       HB_DYNLIB_POST :=
       HB_DYNLIB_PEXT :=
-      HB_DYNLIB_PLOC :=
       HB_DYNLIB_POSC :=
       HB_DYNLIB_PEXC :=
 
diff --git a/harbour/config/linux/sunpro.mk b/harbour/config/linux/sunpro.mk
index 91db3ff7b0..479ec813fb 100644
--- a/harbour/config/linux/sunpro.mk
+++ b/harbour/config/linux/sunpro.mk
@@ -69,6 +69,6 @@ endif
 DY_OUT := -o$(subst x,x, )
 DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
 
-DY_RULE = $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE_NVR) && $(LN) $(@F) $(DYN_FILE_CPT)
+DY_RULE = $(DY) $(DFLAGS) -h $(DYN_NAME_CPT) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE_NVR) && $(LN) $(@F) $(DYN_FILE_CPT)
 
 include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/sunos/gcc.mk b/harbour/config/sunos/gcc.mk
index 6bf1bc69b0..49a06fa9b6 100644
--- a/harbour/config/sunos/gcc.mk
+++ b/harbour/config/sunos/gcc.mk
@@ -56,6 +56,6 @@ DFLAGS += -shared $(LIBPATHS)
 DY_OUT := -o$(subst x,x, )
 DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
 
-DY_RULE = $(DY) $(DFLAGS) -Wl,-soname,$(DYN_NAME_CPT) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE_NVR) && $(LN) $(@F) $(DYN_FILE_CPT)
+DY_RULE = $(DY) $(DFLAGS) -Wl,-h,$(DYN_NAME_CPT) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE_NVR) && $(LN) $(@F) $(DYN_FILE_CPT)
 
 include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/config/sunos/sunpro.mk b/harbour/config/sunos/sunpro.mk
index 8d4c647d7a..72142faae0 100644
--- a/harbour/config/sunos/sunpro.mk
+++ b/harbour/config/sunos/sunpro.mk
@@ -74,6 +74,6 @@ endif
 DY_OUT := -o$(subst x,x, )
 DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
 
-DY_RULE = $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE_NVR) && $(LN) $(@F) $(DYN_FILE_CPT)
+DY_RULE = $(DY) $(DFLAGS) -h $(DYN_NAME_CPT) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE_NVR) && $(LN) $(@F) $(DYN_FILE_CPT)
 
 include $(TOP)$(ROOT)config/rules.mk
diff --git a/harbour/contrib/hbpost.hbm b/harbour/contrib/hbpost.hbm
index ce52270c30..fa9e89545b 100644
--- a/harbour/contrib/hbpost.hbm
+++ b/harbour/contrib/hbpost.hbm
@@ -52,6 +52,7 @@
 "{_HB_BUILD_LIBDYN&darwin}-dflag=-compatibility_version ${hb_major}.${hb_minor}"
 "{_HB_BUILD_LIBDYN&darwin}-dflag=-current_version ${hb_major}.${hb_minor}.${hb_release}"
 "{_HB_BUILD_LIBDYN&linux}-dflag=-Wl,-soname,${hb_dynprefix}${hb_outputname}${hb_dynext}.${hb_major}.${hb_minor}"
+"{_HB_BUILD_LIBDYN&sunos}-dflag=-Wl,-h,${hb_dynprefix}${hb_outputname}${hb_dynext}.${hb_major}.${hb_minor}"
 
 # output name tweaks for dynamic libs
 # NOTE: We're altering previously set output name value here