pkgsrc-WIP-changes archive

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

sra-tools: Limit java-vm.mk to NetBSD



Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Sun Aug 13 16:39:52 2023 -0500
Changeset:	dce08ea20dae767782f555ac3736578f258ec5e6

Modified Files:
	sra-tools/Makefile

Log Message:
sra-tools: Limit java-vm.mk to NetBSD

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

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

diffstat:
 sra-tools/Makefile | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diffs:
diff --git a/sra-tools/Makefile b/sra-tools/Makefile
index 714e565e45..82d3d03d51 100644
--- a/sra-tools/Makefile
+++ b/sra-tools/Makefile
@@ -81,19 +81,23 @@ pre-configure:
 
 post-install:
 	${STRIP} ${DESTDIR}${PREFIX}/bin/*.${PKGVERSION_NOREV}
-	#${MV} ${DESTDIR}${PREFIX}/share/examples ${DESTDIR}${PREFIX}/share/examples-sratools
-	#${MKDIR} ${DESTDIR}${EXAMPLESDIR}
-	#${MV} ${DESTDIR}${PREFIX}/share/examples-sratools/* ${DESTDIR}${EXAMPLESDIR}
-	#${RMDIR} ${DESTDIR}${PREFIX}/share/examples-sratools
-	#${MV} ${DESTDIR}${PREFIX}/share/examples-java ${DESTDIR}${EXAMPLESDIR}/java
-	#${MV} ${DESTDIR}${PREFIX}/share/examples-python ${DESTDIR}${EXAMPLESDIR}/python
+	${MV} ${DESTDIR}${PREFIX}/share/examples ${DESTDIR}${PREFIX}/share/examples-sratools
+	${MKDIR} ${DESTDIR}${EXAMPLESDIR}
+	${MV} ${DESTDIR}${PREFIX}/share/examples-sratools/* ${DESTDIR}${EXAMPLESDIR}
+	${RMDIR} ${DESTDIR}${PREFIX}/share/examples-sratools
+	${MV} ${DESTDIR}${PREFIX}/share/examples-java ${DESTDIR}${EXAMPLESDIR}/java
+	${MV} ${DESTDIR}${PREFIX}/share/examples-python ${DESTDIR}${EXAMPLESDIR}/python
 
 # Shouldn't epoll bl3 check this?
 .if ${OPSYS} != Linux
 .include "../../devel/libepoll-shim/buildlink3.mk"
 .endif
 
+# Triggers openjdk install on Linux even if installed via Yum
+# FIXME: Should we just build without Java to avoid these issues?
+.if ${OPSYS} == NetBSD
 .include "../../mk/java-vm.mk"
+.endif
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/cmake/build.mk"
 .include "../../textproc/libxml2/buildlink3.mk"


Home | Main Index | Thread Index | Old Index