pkgsrc-WIP-changes archive

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

tabixpp: fix missing linker flags & perms



Module Name:	pkgsrc-wip
Committed By:	Winston Weinert <winston%ml1.net@localhost>
Pushed By:	winston
Date:		Thu Mar 29 20:35:28 2018 -0500
Changeset:	e34cb21e042d1ffd3cb72b879332cb732775c47a

Modified Files:
	tabixpp/Makefile
	tabixpp/files/Makefile

Log Message:
tabixpp: fix missing linker flags & perms

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

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

diffstat:
 tabixpp/Makefile       | 5 ++---
 tabixpp/files/Makefile | 9 +++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs:
diff --git a/tabixpp/Makefile b/tabixpp/Makefile
index 458e76d965..6bcf6ddef0 100644
--- a/tabixpp/Makefile
+++ b/tabixpp/Makefile
@@ -26,12 +26,11 @@ INSTALL_TARGET=	install-strip
 
 PORTVERSION=	1.0.0.20171116
 
-post-patch:
+pre-configure:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 post-install:
-	${CP} ${DESTDIR}${PREFIX}/lib/libtabix.so.1 \
-		${DESTDIR}${PREFIX}/lib/libtabix.so
+	cd ${DESTDIR}${PREFIX}/lib && ${LN} -s libtabix.so.1 libtabix.so
 
 .include "../../wip/htslib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/tabixpp/files/Makefile b/tabixpp/files/Makefile
index 4c441ee3c0..2cd1c5ef67 100644
--- a/tabixpp/files/Makefile
+++ b/tabixpp/files/Makefile
@@ -59,10 +59,10 @@ $(LIB): $(OBJS)
 	$(AR) rs $(LIB) $(OBJS)
 
 $(SLIB): $(OBJS)
-	$(CXX) -shared -Wl,-soname,$(SLIB) -o $(SLIB) $(OBJS)
+	$(CXX) $(LDFLAGS) -shared -Wl,-soname,$(SLIB) -o $(SLIB) $(OBJS)
 
 tabix++: $(OBJS) main.cpp $(HTS_LIB)
-	$(CXX) $(CXXFLAGS) -o $@ main.cpp $(OBJS) $(INCLUDES) $(LIBPATH) \
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ main.cpp $(OBJS) $(INCLUDES) $(LIBPATH) \
 		-lhts -lpthread -lm -lz
 
 install: all
@@ -70,8 +70,9 @@ install: all
 	$(MKDIR) $(DESTDIR)$(PREFIX)/include
 	$(MKDIR) $(DESTDIR)$(PREFIX)/lib
 	$(INSTALL) $(BIN) $(DESTDIR)$(PREFIX)/bin
-	$(INSTALL) *.hpp $(DESTDIR)$(PREFIX)/include
-	$(INSTALL) $(LIB) $(SLIB) $(DESTDIR)$(PREFIX)/lib
+	$(INSTALL) -m644 *.hpp $(DESTDIR)$(PREFIX)/include
+	$(INSTALL) $(SLIB) $(DESTDIR)$(PREFIX)/lib
+	$(INSTALL) -m644 $(LIB) $(DESTDIR)$(PREFIX)/lib
 
 install-strip: install
 	$(STRIP) $(DESTDIR)$(PREFIX)/bin/$(BIN) $(DESTDIR)$(PREFIX)/lib/$(SLIB)


Home | Main Index | Thread Index | Old Index