pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

bwa: Fix build on NetBSD



Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Thu Dec 14 09:20:52 2017 -0600
Changeset:	3164482f82f7031dfe4c25ceb56bce0d5ec60d60

Modified Files:
	bwa/distinfo
	bwa/patches/patch-Makefile

Log Message:
bwa: Fix build on NetBSD

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3164482f82f7031dfe4c25ceb56bce0d5ec60d60

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 bwa/distinfo               |  2 +-
 bwa/patches/patch-Makefile | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diffs:
diff --git a/bwa/distinfo b/bwa/distinfo
index ea2867dfc6..eef9dfc3c8 100644
--- a/bwa/distinfo
+++ b/bwa/distinfo
@@ -4,4 +4,4 @@ SHA1 (bwa-0.7.17.tar.gz) = 77f9aac723110227ea51cb42011336d291d03723
 RMD160 (bwa-0.7.17.tar.gz) = d26a266387dee4fc9fcf6eef4f7ffcc076495c22
 SHA512 (bwa-0.7.17.tar.gz) = 114e61b7cc5edcb67172d1eca7be1fa670ea33dd48b5c02c98318e254871363775c0dab327fd7ee7023200a5fedc745fa01cbe0fd9550d783f091d4df6926f48
 Size (bwa-0.7.17.tar.gz) = 232593 bytes
-SHA1 (patch-Makefile) = 8ed885e6d9b37f1ece5a725c57955ee79f74a1fe
+SHA1 (patch-Makefile) = 34e807355fc8f431214f0b1c7be5ed524fe0f620
diff --git a/bwa/patches/patch-Makefile b/bwa/patches/patch-Makefile
index 0e7a61be88..49d7a2cf84 100644
--- a/bwa/patches/patch-Makefile
+++ b/bwa/patches/patch-Makefile
@@ -1,8 +1,7 @@
-$NetBSD: patch-Makefile,v 1.1 2015/12/12 16:56:04 wiedi Exp $
+$NetBSD$
 
-Don't overwrite pkgsrc CC and CFLAGS
-
---- Makefile.orig	2014-05-19 13:11:41 UTC
+# Respect env, add librt for NetBSD
+--- Makefile.orig	2017-10-23 17:10:17.000000000 +0000
 +++ Makefile
 @@ -1,6 +1,6 @@
 -CC=			gcc
@@ -13,3 +12,13 @@ Don't overwrite pkgsrc CC and CFLAGS
  WRAP_MALLOC=-DUSE_MALLOC_WRAPPERS
  AR=			ar
  DFLAGS=		-DHAVE_PTHREAD $(WRAP_MALLOC)
+@@ -18,6 +18,9 @@ SUBDIRS=	.
+ ifeq ($(shell uname -s),Linux)
+ 	LIBS += -lrt
+ endif
++ifeq ($(shell uname -s),NetBSD)
++	LIBS += -lrt
++endif
+ 
+ .SUFFIXES:.c .o .cc
+ 


Home | Main Index | Thread Index | Old Index