From 5662b0423d3331873b4db06586c99305eef95e4c Mon Sep 17 00:00:00 2001
From: Michael Schloh von Bennewitz <ms@openpkg.org>
Date: Sat, 5 Apr 2003 15:33:25 +0000
Subject: [PATCH] Force use of binutils ld command, removing the incompatible
 mapfile flag if it exists. Also, manually build the static library if only a
 shared one was built.

---
 xaw3d/xaw3d.spec | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/xaw3d/xaw3d.spec b/xaw3d/xaw3d.spec
index 25d9a80a44..1a7e4f0997 100644
--- a/xaw3d/xaw3d.spec
+++ b/xaw3d/xaw3d.spec
@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        XWindow
 License:      GPL
 Version:      1.5
-Release:      20030312
+Release:      20030405
 
 #   list of sources
 Source0:      ftp://ftp.x.org/contrib/widgets/Xaw3d/R6.3/Xaw3d-%{version}.tar.gz
@@ -41,7 +41,7 @@ Source0:      ftp://ftp.x.org/contrib/widgets/Xaw3d/R6.3/Xaw3d-%{version}.tar.gz
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20020206, binutils
 PreReq:       OpenPKG, openpkg >= 20020206
 AutoReq:      no
 AutoReqProv:  no
@@ -68,7 +68,14 @@ AutoReqProv:  no
         Imakefile
     xmkmf
     %{l_make} %{l_mflags -O} Makefiles
-    %{l_make} %{l_mflags -O}
+    %{l_shtool} subst  \
+        -e 's; -M mapfile;;g' \
+        Makefile
+    %{l_make} %{l_mflags -O} LD=%{l_prefix}/bin/ld MAKE=%{l_prefix}/bin/make
+    if [ ! -f libXaw3d.a ]; then
+        %{l_prefix}/bin/ar -rs libXaw3d.a *.o
+        ranlib libXaw3d.a
+    fi
 
 %install
     rm -rf $RPM_BUILD_ROOT