pkgsrc-WIP-changes archive

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

minimap2: Patch upstream Makefile to respect LDFLAGS



Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Sun Apr 20 08:28:05 2025 -0500
Changeset:	674af593e9f2f003d1c82e9974e6c287e3226140

Modified Files:
	minimap2/distinfo
	minimap2/patches/patch-Makefile.simde

Log Message:
minimap2: Patch upstream Makefile to respect LDFLAGS

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

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

diffstat:
 minimap2/distinfo                     |  2 +-
 minimap2/patches/patch-Makefile.simde | 32 ++++++++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

diffs:
diff --git a/minimap2/distinfo b/minimap2/distinfo
index 1f442379ff..c2a75f1902 100644
--- a/minimap2/distinfo
+++ b/minimap2/distinfo
@@ -3,5 +3,5 @@ $NetBSD$
 BLAKE2s (minimap2-2.29.tar.gz) = 9db51992b4fe24f57a1363d28c2ccb393abd59949543b711902dd1c178e6690e
 SHA512 (minimap2-2.29.tar.gz) = 5f299cf9a268fab2e58fb915ffac139bfc95b237da0dc084298ff085e39e064e8ffa3f4c1d9f7275feefa917ccded6c9e32a8306558a3fe29a3085581f93c69d
 Size (minimap2-2.29.tar.gz) = 269107 bytes
-SHA1 (patch-Makefile.simde) = 2fd6239d148be24692c876bdc44e371f6c1166d9
+SHA1 (patch-Makefile.simde) = 599fd3841a1d7c628c759fb6546dc985bb36a5a7
 SHA1 (patch-example.c) = ccf0c4addfece2e11b90f5a558a6de324f255d7c
diff --git a/minimap2/patches/patch-Makefile.simde b/minimap2/patches/patch-Makefile.simde
index e2938eb192..7b64ff12e0 100644
--- a/minimap2/patches/patch-Makefile.simde
+++ b/minimap2/patches/patch-Makefile.simde
@@ -1,6 +1,6 @@
 $NetBSD$
 
-# Respect build env
+# Respect standard env vars
 
 --- Makefile.simde.orig	2025-04-18 17:41:47.000000000 +0000
 +++ Makefile.simde
@@ -22,7 +22,8 @@ $NetBSD$
 +		ksw2_exts2_simde.o ksw2_ll_simde.o jump.o
  PROG=		minimap2
  PROG_EXTRA=	sdust minimap2-lite
- LIBS=		-lm -lz -lpthread
+-LIBS=		-lm -lz -lpthread
++LDFLAGS+=	-lm -lz -lpthread
  
 +PREFIX?=	/usr/local
 +MAN1DIR?=	${PREFIX}/man/man1
@@ -35,8 +36,18 @@ $NetBSD$
  
  ifneq ($(arm_neon),) # if arm_neon is defined
  ifeq ($(aarch64),)   #if aarch64 is not defined
-@@ -26,7 +39,7 @@ ifneq ($(tsan),)
- 	LIBS+=-fsanitize=thread
+@@ -18,15 +31,15 @@ endif
+ 
+ ifneq ($(asan),)
+ 	CFLAGS+=-fsanitize=address
+-	LIBS+=-fsanitize=address
++	LDFLAGS+=-fsanitize=address
+ endif
+ 
+ ifneq ($(tsan),)
+ 	CFLAGS+=-fsanitize=thread
+-	LIBS+=-fsanitize=thread
++	LDFLAGS+=-fsanitize=thread
  endif
  
 -.PHONY:all extra clean depend
@@ -44,6 +55,19 @@ $NetBSD$
  .SUFFIXES:.c .o
  
  .c.o:
+@@ -37,10 +50,10 @@ all:$(PROG)
+ extra:all $(PROG_EXTRA)
+ 
+ minimap2:main.o libminimap2.a
+-		$(CC) $(CFLAGS) main.o -o $@ -L. -lminimap2 $(LIBS)
++		$(CC) $(CFLAGS) main.o -o $@ -L. -lminimap2 $(LDFLAGS)
+ 
+ minimap2-lite:example.o libminimap2.a
+-		$(CC) $(CFLAGS) $< -o $@ -L. -lminimap2 $(LIBS)
++		$(CC) $(CFLAGS) $< -o $@ -L. -lminimap2 $(LDFLAGS)
+ 
+ libminimap2.a:$(OBJS)
+ 		$(AR) -csru $@ $(OBJS)
 @@ -60,8 +73,27 @@ ksw2_extd2_simde.o:ksw2_extd2_sse.c ksw2
  ksw2_exts2_simde.o:ksw2_exts2_sse.c ksw2.h kalloc.h
  		$(CC) -c $(CFLAGS) -msse4.1 $(CPPFLAGS) $(INCLUDES) $< -o $@


Home | Main Index | Thread Index | Old Index