From 2d7e35dd4f151797e1445fbc06c2712baa4de765 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Fri, 23 Jul 1999 22:52:16 +0000
Subject: Make buildling of shared libraries work on ELF systems.

---
 x11/xview-config/files/patch-sum  |  4 +--
 x11/xview-config/patches/patch-ad | 72 +++++++++++++++++++++++++--------------
 2 files changed, 49 insertions(+), 27 deletions(-)

(limited to 'x11/xview-config')

diff --git a/x11/xview-config/files/patch-sum b/x11/xview-config/files/patch-sum
index 5b82b5b89c9..357f75173e1 100644
--- a/x11/xview-config/files/patch-sum
+++ b/x11/xview-config/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:39 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/07/23 22:52:16 tron Exp $
 
 MD5 (patch-aa) = b69ab21b731398be126ae9570ee6d24b
 MD5 (patch-ab) = 9468a4ecc579f87f0270bd70d9f34846
 MD5 (patch-ac) = c8ab3024586b6530bd3a38a47e90358d
-MD5 (patch-ad) = f839283ec5ff91f15a4f30b1caca06b7
+MD5 (patch-ad) = 5792fd52c3486b2f5e58f0b9a947f7f4
 MD5 (patch-ae) = 53169fd4703265904e11817a57454e6d
diff --git a/x11/xview-config/patches/patch-ad b/x11/xview-config/patches/patch-ad
index 30775a459f0..b29f0b5b8fd 100644
--- a/x11/xview-config/patches/patch-ad
+++ b/x11/xview-config/patches/patch-ad
@@ -1,26 +1,48 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:18:33 agc Exp $
+$NetBSD: patch-ad,v 1.3 1999/07/23 22:52:17 tron Exp $
 
-diff -rc ../old/xview3.2p1-X11R6/config/XView.rules XView.rules
-*** ../old/xview3.2p1-X11R6/config/XView.rules	Tue Jun 29 01:13:20 1993
---- XView.rules	Sun Nov 20 13:38:59 1994
-***************
-*** 366,374 ****
-  #ifndef InstallSharedLibraryNoBuild
-  #define	InstallSharedLibraryNoBuild(libname,rev,dest)				@@\
-  install::  								@@\
-!         $(RM) /dest/lib/**/libname.so                                   @@\
-  	$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.so.rev dest	@@\
-!         (cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so)
-  
-  #endif /* InstallSharedLibraryNoBuild */
-  
---- 366,374 ----
-  #ifndef InstallSharedLibraryNoBuild
-  #define	InstallSharedLibraryNoBuild(libname,rev,dest)				@@\
-  install::  								@@\
-! 	$(RM) /dest/lib/**/libname.so                                   @@\
-  	$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.so.rev dest	@@\
-! 	(cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so)
-  
-  #endif /* InstallSharedLibraryNoBuild */
-  
+--- XView.rules.orig	Tue Jun 29 07:13:20 1993
++++ XView.rules	Sat Jul 24 00:28:53 1999
+@@ -141,6 +141,23 @@
+  * included in both the .so and the .sa parts of the library.
+  */
+ #ifndef SubdirBuildNormalSharedLibraryTarget
++#if UseElfFormat == YES
++#define SubdirBuildNormalSharedLibraryTarget(libname,rev,solist,sodir)		@@\
++AllTarget(lib/**/libname.so.rev)					@@\
++									@@\
++lib/**/libname.so.rev:: solist 						@@\
++	$(RM) $@~ sodir/lib/**/libname.so.xs.o				@@\
++	@if [ -f xstrings ]; then \                                     @@\
++        	$(RM) strings; $(CP) xstrings strings; fi               @@\
++	(cd sodir; $(CC) -o ../$@~ $(SHLIBLDFLAGS) ?*.o)		@@\
++	-@if [ -f strings~ ]; then $(RM) strings~; else exit 0; fi	@@\
++	$(RM) $@  							@@\
++	$(MV) $@~ $@							@@\
++									@@\
++clean::									@@\
++	$(RM) lib/**/libname.so.rev sodir/?*.o strings*
++
++#else
+ #define SubdirBuildNormalSharedLibraryTarget(libname,rev,solist,sodir)		@@\
+ AllTarget(lib/**/libname.so.rev)					@@\
+ 									@@\
+@@ -156,6 +173,7 @@
+ clean::									@@\
+ 	$(RM) lib/**/libname.so.rev sodir/?*.o strings*
+ 
++#endif
+ #endif /* SubdirBuildNormalSharedLibraryTarget */
+ 
+ /*
+@@ -366,9 +384,9 @@
+ #ifndef InstallSharedLibraryNoBuild
+ #define	InstallSharedLibraryNoBuild(libname,rev,dest)				@@\
+ install::  								@@\
+-        $(RM) /dest/lib/**/libname.so                                   @@\
++	$(RM) /dest/lib/**/libname.so                                   @@\
+ 	$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.so.rev dest	@@\
+-        (cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so)
++	(cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so)
+ 
+ #endif /* InstallSharedLibraryNoBuild */
+ 
-- 
cgit v1.2.3