Re: Make lang/tinyscheme compile under both Linux and NetBSD

[Silas Silva <silasdb%gmail.com@localhost>]

On Sat, Feb 19, 2011 at 06:28:31PM +0300, Aleksej Saushev wrote:
> Perhaps, you should reuse ${BUILDLINK_LDADD.dl:Q}, e.g., pass its value
> in MAKE_ENV or so. See Jeremy's comment on dlopen.buildlink3.mk.

Thank you very much for the tips, Aleksej and Jeremy.  After changes, it
compiles and runs fine under Linux and NetBSD.

A new patch is attached.  Is it fine?  May I open a PR on that?

-- 
Silas Silva

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tinyscheme/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile    12 Aug 2010 10:22:40 -0000      1.12
+++ Makefile    21 Feb 2011 12:16:22 -0000
@@ -14,6 +14,9 @@
 MAKE_FILE=     makefile
 USE_LIBTOOL=   yes
 
+.include "../../mk/dlopen.buildlink3.mk"
+MAKE_ENV+=     SYS_LIBS=${BUILDLINK_LDADD.dl:Q}
+
 PKG_DESTDIR_SUPPORT=   user-destdir
 INSTALLATION_DIRS=     bin include lib share/tinyscheme
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tinyscheme/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo    12 Aug 2010 10:22:40 -0000      1.10
+++ distinfo    21 Feb 2011 12:16:22 -0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2010/08/12 10:22:40 asau Exp $
+$NetBSD$
 
 SHA1 (tinyscheme1.39.zip) = d759bff93683399ee7abbfd1a822d000adb22a0c
 RMD160 (tinyscheme1.39.zip) = d8d365ccceb9482ffd457fd6d4f97c1651e131e9
 Size (tinyscheme1.39.zip) = 58751 bytes
-SHA1 (patch-aa) = 94cac80297b4e89e2fe2ff8a575c616354aa122d
+SHA1 (patch-aa) = 64c19a07755ea73382aca58dea1fe6de8a83ec63
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tinyscheme/patches/patch-aa,v
retrieving revision 1.7
diff -u -r1.7 patch-aa
--- patches/patch-aa    12 Aug 2010 10:22:41 -0000      1.7
+++ patches/patch-aa    21 Feb 2011 12:16:22 -0000
@@ -1,7 +1,5 @@
-$NetBSD: patch-aa,v 1.7 2010/08/12 10:22:41 asau Exp $
-
---- makefile.orig      2006-12-07 13:29:24.000000000 +0300
-+++ makefile   2010-08-12 14:14:07.000000000 +0400
+--- makefile.orig      2006-12-07 13:29:24.000000000 -0200
++++ makefile   2011-02-21 09:11:20.000000000 -0300
 @@ -18,7 +18,7 @@
  #AR= echo
  
@@ -11,13 +9,7 @@
  DEBUG=-g -Wall -Wno-char-subscripts -O 
  Osuf=o 
  SOsuf=so 
-@@ -28,16 +28,17 @@
- OUT = -o $@ 
- RM= -rm -f
- AR= ar crs
-+SYS_LIBS= -lm
-  
- # Linux 
+@@ -33,11 +33,11 @@
  LD = gcc 
  LDFLAGS = -shared 
  DEBUG=-g -Wno-char-subscripts -O
@@ -31,7 +23,7 @@
  
   
  # Solaris 
-@@ -57,19 +58,23 @@
+@@ -57,19 +57,23 @@
  LIBTARGET = $(LIBPREFIX)tinyscheme.$(SOsuf) 
  STATICLIBTARGET = $(LIBPREFIX)tinyscheme.$(LIBsuf)