Fix build with clang and stagify.

This commit is contained in:
Alex Dupre 2013-10-30 09:21:21 +00:00
parent 6a1765003e
commit 366eac9b99
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=332087
2 changed files with 19 additions and 10 deletions

View File

@ -11,8 +11,11 @@ DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g}
MAINTAINER= ale@FreeBSD.org
COMMENT= PKCS\#11 Java wrapper
OPTIONS_DEFINE= DOCS EXAMPLES
USE_ZIP= yes
USE_JAVA= yes
USE_DOS2UNIX= Makefile
JAVA_VERSION= 1.6+
JAVA_OS= native
USE_GMAKE= yes
@ -23,7 +26,6 @@ PLIST_FILES= lib/libpkcs11wrapper.so %%JAVAJARDIR%%/iaikPkcs11Wrapper.jar
PORTDOCS= *
PORTEXAMPLES= *
NO_STAGE= yes
.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
@ -34,23 +36,23 @@ WRKSRC= ${WRKDIR}/src/native/unix/linux-x86
do-install:
@${ECHO_MSG} -n ">> Installing JNI library in ${PREFIX}/lib..."
@${INSTALL_PROGRAM} ${WRKSRC}/release/libpkcs11wrapper.so ${PREFIX}/lib/
@${INSTALL_PROGRAM} ${WRKSRC}/release/libpkcs11wrapper.so ${STAGEDIR}${PREFIX}/lib/
@${ECHO_MSG} " [ DONE ]"
@${ECHO_MSG} -n ">> Installing JAR file as ${JAVAJARDIR}/iaikPkcs11Wrapper.jar..."
@${INSTALL_DATA} ${WRKDIR}/bin/iaikPkcs11Wrapper.jar ${JAVAJARDIR}/
@${INSTALL_DATA} ${WRKDIR}/bin/iaikPkcs11Wrapper.jar ${STAGEDIR}${JAVAJARDIR}/
@${ECHO_MSG} " [ DONE ]"
.if !defined(NOPORTDOCS)
@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
@${MKDIR} ${DOCSDIR}
.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
@cd ${WRKDIR}/docs && ${FIND} * | \
${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1
@${ECHO_MSG} " [ DONE ]"
.endif
.if !defined(NOPORTEXAMPLES)
@${ECHO_MSG} -n ">> Installing examples in ${EXAMPLESDIR}..."
@${MKDIR} ${EXAMPLESDIR}
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
@cd ${WRKDIR}/examples && ${FIND} * | \
${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} > /dev/null 2>&1
${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR} > /dev/null 2>&1
@${ECHO_MSG} " [ DONE ]"
.endif

View File

@ -0,0 +1,7 @@
--- Makefile.orig 2013-10-30 08:34:48.105849638 +0000
+++ Makefile 2013-10-30 08:35:06.293848426 +0000
@@ -1,4 +1,3 @@
-CC = gcc
SOURCE_DIR = ../../common/
PLATFORM_SRC_INCLUDE = ../src/
DEBUG_OUTPUT_DIR = debug/