diff options
| author | jperkin <jperkin> | 2014-12-15 12:31:09 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2014-12-15 12:31:09 +0000 |
| commit | 4ab7959d813737761ee0fcff088514cc800924d9 (patch) | |
| tree | beb8bb70e5daf37ffb38066f738a9049de112ab1 /cross/atasm | |
| parent | b00567b1681bab0465b7bbe5e6dca9c09fa927a7 (diff) | |
| download | pkgsrc-4ab7959d813737761ee0fcff088514cc800924d9.tar.gz | |
Find correct zlib.
Diffstat (limited to 'cross/atasm')
| -rw-r--r-- | cross/atasm/Makefile | 3 | ||||
| -rw-r--r-- | cross/atasm/distinfo | 4 | ||||
| -rw-r--r-- | cross/atasm/patches/patch-aa | 14 |
3 files changed, 14 insertions, 7 deletions
diff --git a/cross/atasm/Makefile b/cross/atasm/Makefile index f1ba0020e96..725f6b24cc5 100644 --- a/cross/atasm/Makefile +++ b/cross/atasm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2014/12/09 15:10:47 mef Exp $ +# $NetBSD: Makefile,v 1.12 2014/12/15 12:37:01 jperkin Exp $ # DISTNAME= atasm106 @@ -15,6 +15,7 @@ LICENSE= gnu-gpl-v2 WRKSRC= ${WRKDIR}/${DISTNAME} NO_CONFIGURE= YES BUILD_DIRS= src +MAKE_ENV= ZLIB="-L${BUILDLINK_PREFIX.zlib}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.zlib}/lib -lz" DOCDIR= ${PREFIX}/share/doc/atasm EXAMPLE_DIR= ${PREFIX}/share/examples/atasm diff --git a/cross/atasm/distinfo b/cross/atasm/distinfo index 9fbe935364c..bb945118586 100644 --- a/cross/atasm/distinfo +++ b/cross/atasm/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2014/12/09 15:10:47 mef Exp $ +$NetBSD: distinfo,v 1.6 2014/12/15 12:37:01 jperkin Exp $ SHA1 (atasm106.zip) = c016c2f6ee611e001dbd026923c29ce509979f1c RMD160 (atasm106.zip) = e9935d0e202bc668114af9d11fdbf396399cb6d3 Size (atasm106.zip) = 368360 bytes -SHA1 (patch-aa) = d87376db3b9babe3578b8cc614a418066c3488f3 +SHA1 (patch-aa) = e040580b87e68fc7ec2230fb22bc45b5d168ca83 SHA1 (patch-ab) = 18c516a98ae5cbae3f8df7f38ca87bd1f47b9664 diff --git a/cross/atasm/patches/patch-aa b/cross/atasm/patches/patch-aa index b30770a6829..df793729e63 100644 --- a/cross/atasm/patches/patch-aa +++ b/cross/atasm/patches/patch-aa @@ -1,10 +1,16 @@ -$NetBSD: patch-aa,v 1.3 2014/12/09 15:10:47 mef Exp $ +$NetBSD: patch-aa,v 1.4 2014/12/15 12:37:01 jperkin Exp $ Honor CC, CFLAGS and LDFLAGS from pkgsrc. ---- Makefile.orig 2009-03-18 05:39:26.000000000 +0900 -+++ src/Makefile 2014-12-09 23:26:41.000000000 +0900 -@@ -17,10 +17,10 @@ UNIX = -DUNIX +--- src/Makefile.orig 2009-03-17 20:39:26.000000000 +0000 ++++ src/Makefile +@@ -12,15 +12,15 @@ + # if you are compiling under UNIX, change the above lines to + # reflect the location of zlib. I use: + USEZ = -DZLIB_CAPABLE +-ZLIB = -lz ++#ZLIB = -lz + UNIX = -DUNIX # Compiler flags, if you are using egcs, pgcs, or gcc >2.8.1 use: #CFLAGS = -g -Wall $(USEZ) $(DOS) $(UNIX) |