pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
fastp: Clean up
Module Name: pkgsrc-wip
Committed By: Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By: outpaddling
Date: Fri May 3 11:37:57 2019 -0500
Changeset: 557b66a67fe4bd5b0500ffe990c0c5ba503164fc
Modified Files:
fastp/Makefile
fastp/distinfo
fastp/patches/patch-Makefile
Removed Files:
fastp/TODO
Log Message:
fastp: Clean up
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=557b66a67fe4bd5b0500ffe990c0c5ba503164fc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
fastp/Makefile | 12 +++++++-----
fastp/TODO | 2 --
fastp/distinfo | 2 +-
fastp/patches/patch-Makefile | 5 +++--
4 files changed, 11 insertions(+), 10 deletions(-)
diffs:
diff --git a/fastp/Makefile b/fastp/Makefile
index 22a4fe75c7..2d41ef3aba 100644
--- a/fastp/Makefile
+++ b/fastp/Makefile
@@ -4,17 +4,19 @@ DISTNAME= fastp-0.20.0
CATEGORIES= biology
MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenGene/}
GITHUB_PROJECT= fastp
-GITHUB_TAG= v0.20.0
+GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= bacon%NetBSD.org@localhost
HOMEPAGE= https://github.com/OpenGene/fastp
COMMENT= Ultra-fast all-in-one FASTQ preprocessor
LICENSE= mit
-USE_LANGUAGES= c c++
-USE_TOOLS+= gmake
-BUILD_TARGET= fastp
-INSTALL_TARGET= install-strip
+USE_LANGUAGES= c c++
+USE_TOOLS+= gmake
+BUILD_TARGET= fastp
+PTHREAD_AUTO_VARS= yes
+INSTALL_TARGET= install-strip
.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/fastp/TODO b/fastp/TODO
deleted file mode 100644
index d15f150c9a..0000000000
--- a/fastp/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Missing -L flags on NetBSD
diff --git a/fastp/distinfo b/fastp/distinfo
index 2bdb3626f2..15a6132328 100644
--- a/fastp/distinfo
+++ b/fastp/distinfo
@@ -4,4 +4,4 @@ SHA1 (fastp-0.20.0.tar.gz) = 657888d18b40aa18aa6d68e31a5e930ae8cf1606
RMD160 (fastp-0.20.0.tar.gz) = 0ad6a0eb389e31855f1fa95a089aaa653164f88e
SHA512 (fastp-0.20.0.tar.gz) = 33349b761283a42fb9eaf045ab7f839d5ec335fb394e277519b87f8c95cf682027ab183b174a1b82d908a3e4d1d65ac63a88c30efea04d93a08f559c1a7a732c
Size (fastp-0.20.0.tar.gz) = 139422 bytes
-SHA1 (patch-Makefile) = b250f1916795cd5bd5244a297be4f4dd7a7c94f2
+SHA1 (patch-Makefile) = 38b5f2bb400cb6b8a962126e1ad1887fc8a5990e
diff --git a/fastp/patches/patch-Makefile b/fastp/patches/patch-Makefile
index fc822bea7f..323e3d0ed4 100644
--- a/fastp/patches/patch-Makefile
+++ b/fastp/patches/patch-Makefile
@@ -21,10 +21,11 @@ $NetBSD$
CXX ?= g++
-CXXFLAGS := -std=c++11 -g -O3 -I${DIR_INC} $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir)) ${CXXFLAGS}
+-LIBS := -lz -lpthread
+-LD_FLAGS := $(foreach librarydir,$(LIBRARY_DIRS),-L$(librarydir)) $(LIBS) $(LD_FLAGS)
+CXXFLAGS ?= -g -O3
+CXXFLAGS += -std=c++11 -I${DIR_INC} $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir))
- LIBS := -lz -lpthread
--LD_FLAGS := $(foreach librarydir,$(LIBRARY_DIRS),-L$(librarydir)) $(LIBS) $(LD_FLAGS)
++LIBS := -lz
+LDFLAGS += $(foreach librarydir,$(LIBRARY_DIRS),-L$(librarydir)) $(LIBS)
Home |
Main Index |
Thread Index |
Old Index