diff options
| author | cheusov <cheusov@pkgsrc.org> | 2011-12-06 13:22:17 +0000 |
|---|---|---|
| committer | cheusov <cheusov@pkgsrc.org> | 2011-12-06 13:22:17 +0000 |
| commit | 70aebb27e22291a514a88e2d501211e595dabdf4 (patch) | |
| tree | 8cba6b45dbb95608d94c7cbc1c95b8d2feb03fe8 /lang | |
| parent | d0e3a0f55ed6740bc2c978ac2c8c0598b3714e40 (diff) | |
| download | pkgsrc-70aebb27e22291a514a88e2d501211e595dabdf4.tar.gz | |
Fix build failure on Linux(PR 44628).
I think Haiku vs. -lm is a separate issue.
Also, I don't think .ifdef-ing all packages that use -lm is impractical.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/tinyscheme/Makefile | 7 | ||||
| -rw-r--r-- | lang/tinyscheme/distinfo | 4 | ||||
| -rw-r--r-- | lang/tinyscheme/patches/patch-aa | 26 |
3 files changed, 9 insertions, 28 deletions
diff --git a/lang/tinyscheme/Makefile b/lang/tinyscheme/Makefile index 2b3ebde32af..b5cbaac2ad3 100644 --- a/lang/tinyscheme/Makefile +++ b/lang/tinyscheme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2011/05/02 11:35:18 obache Exp $ +# $NetBSD: Makefile,v 1.15 2011/12/06 13:22:17 cheusov Exp $ DISTNAME= tinyscheme-1.40 CATEGORIES= lang @@ -17,4 +17,9 @@ MAKE_FILE= makefile INSTALLATION_DIRS= bin include lib share/tinyscheme +MAKE_FLAGS+= SYS_LIBS=-lm\ ${BUILDLINK_LDADD.dl:Q} +MAKE_FLAGS+= CC=${CC:Q} LDFLAGS=${LDFLAGS:Q} DEBUG= +MAKE_FLAGS+= LD=${CC:Q} + +.include "../../mk/dlopen.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/tinyscheme/distinfo b/lang/tinyscheme/distinfo index 5467a7c48ab..5dc70276f41 100644 --- a/lang/tinyscheme/distinfo +++ b/lang/tinyscheme/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.11 2011/04/16 16:10:59 asau Exp $ +$NetBSD: distinfo,v 1.12 2011/12/06 13:22:17 cheusov Exp $ SHA1 (tinyscheme-1.40.tar.gz) = e03f7ac41f0517bb35eced2772c79eb9db42ea82 RMD160 (tinyscheme-1.40.tar.gz) = 1eac087a90c2c2e8ca5f4cefbc5660b96491e4b3 Size (tinyscheme-1.40.tar.gz) = 60160 bytes -SHA1 (patch-aa) = 47462044ec20f3c4f9cc551e22e69007c4bf85d8 +SHA1 (patch-aa) = 0851a17a9c1c8fd0f3dae40209a49e1574296d78 diff --git a/lang/tinyscheme/patches/patch-aa b/lang/tinyscheme/patches/patch-aa index 54a051113cb..f30c3c9cc81 100644 --- a/lang/tinyscheme/patches/patch-aa +++ b/lang/tinyscheme/patches/patch-aa @@ -1,31 +1,7 @@ -$NetBSD: patch-aa,v 1.8 2011/04/16 16:10:59 asau Exp $ +$NetBSD: patch-aa,v 1.9 2011/12/06 13:22:17 cheusov Exp $ --- makefile.orig 2011-01-16 10:51:17.000000000 +0300 +++ makefile 2011-03-30 20:38:01.000000000 +0400 -@@ -18,7 +18,7 @@ - #AR= echo - - # Unix, generally --CC = gcc -fpic -+#CC = gcc -fpic - DEBUG=-g -Wall -Wno-char-subscripts -O - Osuf=o - SOsuf=so -@@ -28,12 +28,13 @@ - OUT = -o $@ - RM= -rm -f - AR= ar crs -+SYS_LIBS= -lm - - # Linux - LD = gcc - LDFLAGS = -shared - DEBUG=-g -Wno-char-subscripts -O --SYS_LIBS= -ldl -+#SYS_LIBS= -ldl - PLATFORM_FEATURES= -DSUN_DL=1 - - # Cygwin @@ -57,19 +58,23 @@ LIBTARGET = $(LIBPREFIX)tinyscheme.$(SOsuf) STATICLIBTARGET = $(LIBPREFIX)tinyscheme.$(LIBsuf) |