From: Marcin Cieslak <saper@saper.info>
Date: Mon, 13 Aug 2012 02:01:45 +0000 (+0200)
Subject: Improve creation of shared libraries for FreeBSD
X-Git-Tag: 2.2.0b~83^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e1aa4d28cbf908e01b5b993aa1ba1b44ac6bb5a4;p=oweals%2Fcde.git

Improve creation of shared libraries for FreeBSD
---

diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf
index 5e3a00d8..dc37202d 100644
--- a/cde/config/cf/FreeBSD.cf
+++ b/cde/config/cf/FreeBSD.cf
@@ -4,7 +4,7 @@ XCOMM platform:  $TOG: FreeBSD.cf /main/21 1997/10/05 20:42:34 kaleb $
 #define OSName			DefaultOSName
 #endif
 #ifndef OSVendor
-#define OSVendor		Walnut Creek CD-ROM
+#define OSVendor		FreeBSD Foundation
 #endif
 #ifndef OSMajorVersion
 #define OSMajorVersion		DefaultOSMajorVersion
@@ -57,6 +57,8 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 #define DefaultCCOptions	-pipe
 #endif
 
+#define CplusplusLibC		-lstdc++
+
 #if OSMajorVersion > 1
 #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
 #define XawI18nDefines		-DUSE_XWCHAR_STRING
diff --git a/cde/config/cf/bsdLib.rules b/cde/config/cf/bsdLib.rules
index 8c052221..0d18ecac 100644
--- a/cde/config/cf/bsdLib.rules
+++ b/cde/config/cf/bsdLib.rules
@@ -33,8 +33,8 @@ XCOMM $XConsortium: bsdLib.rules /main/3 1996/09/28 16:09:18 rws $
 #define InstallSharedLibrary(libname,rev,dest)				@@\
 install:: Concat(lib,libname.so.rev)					@@\
 	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest 
-@@\
+	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
+	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
 
 #endif /* InstallSharedLibrary */
 
@@ -52,10 +52,13 @@ Concat(lib,libname.so.rev):  solist $(EXTRALIBRARYDEPS)			@@\
 	(cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
 	$(RM) $@							@@\
 	$(MV) $@~ $@							@@\
+	$(RM) Concat(lib,libname.so)					@@\
+	$(LN) $@ Concat(lib,libname.so)					@@\
 	LinkBuildLibrary($@)						@@\
+	LinkBuildLibrary(Concat(lib,libname.so))			@@\
 									@@\
 clean::									@@\
-	$(RM) Concat(lib,libname.so.rev)
+	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
 
 #endif /* SharedLibraryTarget */