Resolves: bug 256515

Description: OpenBSD: ld libldap50.a error
Fix Description: Use the c compiler (gcc) to link.  Always use the -fPIC -shared flags for linking, no matter what the chip arch is.

directory/c-sdk/config/OpenBSD.mk

@@ -43,6 +43,7 @@ include $(MOD_DEPTH)/config/UNIX.mk
 
 CC                     = gcc
 CCC                    = g++
+LD                     = $(CC)
 RANLIB                 = ranlib
 
 OS_REL_CFLAGS          =
@@ -66,16 +67,8 @@ ARCH                   = openbsd
 DLL_SUFFIX             = so.1.0
 
 DSO_CFLAGS             = -fPIC
-DSO_LDOPTS             = -Bshareable
-ifeq ($(OS_TEST),alpha)
+
 DSO_LDOPTS             = -shared
-endif
-ifeq ($(OS_TEST),mips)
-DSO_LDOPTS             = -shared
-endif
-ifeq ($(OS_TEST),pmax)  
-DSO_LDOPTS             = -shared
-endif
 
 MKSHLIB                        = $(LD) $(DSO_LDOPTS)
 

directory/c-sdk/configure

@@ -5087,6 +5087,7 @@ EOF
 	;;
 
 *-openbsd*)
+    LD='$(CC)'
     cat >> confdefs.h <<\EOF
 #define XP_UNIX 1
 EOF
@@ -5097,6 +5098,10 @@ EOF
 
     cat >> confdefs.h <<\EOF
 #define HAVE_BSD_FLOCK 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define HAVE_SOCKLEN_T 1
 EOF
 
     CFLAGS="$CFLAGS -ansi -Wall"
@@ -5104,12 +5109,7 @@ EOF
     DLL_SUFFIX=so.1.0
     DSO_CFLAGS=-fPIC
     USE_NSPR_THREADS=1
-    case "$OS_TEST" in
-    alpha|mips|pmax)
-        DSO_LDOPTS=-shared ;;
-    *)
-        DSO_LDOPTS=-Bshareable ;;
-    esac
+    DSO_LDOPTS='-shared -fPIC'
     ;;
 
 *-openvms*)

directory/c-sdk/configure.in

@@ -1776,20 +1776,17 @@ mips-sony-newsos*)
 	;;
 
 *-openbsd*)
+    LD='$(CC)'
     AC_DEFINE(XP_UNIX)
     AC_DEFINE(OPENBSD)
     AC_DEFINE(HAVE_BSD_FLOCK)
+    AC_DEFINE(HAVE_SOCKLEN_T)
     CFLAGS="$CFLAGS -ansi -Wall"
     CXXFLAGS="$CXXFLAGS -ansi -Wall"
     DLL_SUFFIX=so.1.0
     DSO_CFLAGS=-fPIC
     USE_NSPR_THREADS=1
-    case "$OS_TEST" in
-    alpha|mips|pmax)
-        DSO_LDOPTS=-shared ;;
-    *)
-        DSO_LDOPTS=-Bshareable ;;
-    esac
+    DSO_LDOPTS='-shared -fPIC'
     ;;
 
 *-openvms*)