1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-26 09:46:09 +00:00

Fix configure when HDF was built with SZIP support [1]

Fix configure to allow build by non-root user (it tests if /usr/local is writable)
Remove MD5 from distinfo

PR:			ports/151883
Submitted by:		Rob Farmer (maintainer)
Reported & tested by:	Wasp <wasp at gmx.ch> [1]
This commit is contained in:
Max Brazhnikov 2010-11-04 13:05:36 +00:00
parent c01494555d
commit b69f5181f0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=264077
3 changed files with 37 additions and 1 deletions

View File

@ -29,9 +29,18 @@ CONFIGURE_ARGS= --with-jdk=${JAVA_HOME}/include,${JAVA_HOME}/jre/lib/ \
WRKSRC= ${WRKDIR}/${PORTNAME}
OPTIONS= SZIP "SZIP support (must match with science/hdf5-18)" off
.include <bsd.port.options.mk>
.if defined(WITH_SZIP)
CONFIGURE_ARGS+= --with-libsz=${LOCALBASE}/lib
.endif
post-patch:
${REINPLACE_CMD} -e 's|"/libhdf.$$LLEXT"|"${LOCALBASE}/lib"|' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's|$$z_lib"/libz."$$LLEXT|"/lib/libz.so.*"|' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's|$$sz_lib"/libsz."$$LLEXT|"${LOCALBASE}/lib/libsz.so.*"|' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's|LLEXT="a"|LLEXT="so"|g' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's|COPT="-shared"|COPT="-fPIC"|g' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's|$$(JH45INSTALLDIR)/lib|${JAVAJARDIR}|' ${WRKSRC}/Makefile.in

View File

@ -1,3 +1,2 @@
MD5 (hdf-java-2.6.1-src.tar) = c3cd791560291c659b493d97e63a9e8e
SHA256 (hdf-java-2.6.1-src.tar) = 14abf95abe9a863b03d396e87da463da4746e54f05f5c63aef583461ef1401ea
SIZE (hdf-java-2.6.1-src.tar) = 10393600

View File

@ -0,0 +1,28 @@
--- configure.orig 2010-11-01 02:54:27.000000000 -0700
+++ configure 2010-11-01 02:56:20.000000000 -0700
@@ -4424,12 +4424,6 @@
if test \( ! -d "$JH45INST" \); then
JH45INST_FOUND=0
fi
- if test \( ! -w "$JH45INST" \); then
- { { echo "$as_me:$LINENO: error: $JAVINST : not writable " >&5
-echo "$as_me: error: $JAVINST : not writable " >&2;}
- { (exit 1); exit 1; }; }
- JH45INST_FOUND=0
- fi
fi
until test $JH45INST_FOUND -eq 1; do
echo "Please type the directory in which to install the JH45"
@@ -4438,12 +4432,6 @@
if test \( ! -d "$JH45INST" \); then
JH45INST_FOUND=0
fi
- if test \( ! -w "$JH45INST" \); then
- { { echo "$as_me:$LINENO: error: $JAVINST : not writable " >&5
-echo "$as_me: error: $JAVINST : not writable " >&2;}
- { (exit 1); exit 1; }; }
- JH45INST_FOUND=0
- fi
done
ac_cv_lib_JH45INST=$JH45INST