kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

1) Fix build with threads;

Browse source 
2) ECW support now requires threads;
3) Build with internal libtiff by default (supports BigTiff);

Do not bump PORTREVISION.

Submitted by:	glebius (maintainer)
This commit is contained in:
Sergey A. Osokin 2010-08-05 19:03:52 +00:00
parent c5065a0269
commit 34465406ca
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=258827
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
graphics/gdal/Makefile
View file

@ -31,7 +31,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
OPTIONS= CFITSIO "FITS support" off \
CURL "Curl support" off \
ECW "ECW & JPEG2000 support" off \
ECW "ECW & JPEG2000 support (THREAD required)" off \
EXPAT "Expat support" off \
GEOS "GEOS support" off \
GEOTIFF "GeoTIFF support" on \
@ -52,8 +52,8 @@ OPTIONS= CFITSIO "FITS support" off \
PYTHON "Python support" on \
RUBY "Ruby support" off \
SQLITE "SQLite support" off \
THREAD "Thread support" off\
TIFF "TIFF support" on \
THREAD "Thread support" off \
TIFF "External libtiff" off \
XERCES "Xerces support" off
.include <bsd.port.pre.mk>
@ -72,13 +72,6 @@ CONFIGURE_ARGS+= --with-curl=${LOCALBASE}/bin/curl-config
CONFIGURE_ARGS+= --with-curl=no
.endif
.if defined(WITH_ECW)
LIB_DEPENDS+= NCSEcw.0:${PORTSDIR}/graphics/libecwj2
CONFIGURE_ARGS+= --with-ecw=${LOCALBASE}
.else
CONFIGURE_ARGS+= --with-ecw=no
.endif
.if defined(WITH_EXPAT)
LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2
CONFIGURE_ARGS+= --with-expat=${LOCALBASE} \
@ -218,13 +211,26 @@ CONFIGURE_ARGS+= --with-sqlite=no
.endif
.if !defined(WITHOUT_THREAD)
CONFIGURE_ARGS+= --with-threads=${PTHREAD_LIBS}
CONFIGURE_ARGS+= --with-threads=yes
CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
.if defined(WITH_ECW)
LIB_DEPENDS+= NCSEcw.0:${PORTSDIR}/graphics/libecwj2
CONFIGURE_ARGS+= --with-ecw=${LOCALBASE}
.else
CONFIGURE_ARGS+= --with-ecw=no
.endif
.else
CONFIGURE_ARGS+= --with-threads=no
.if defined(WITH_ECW)
IGNORE= THREAD option required. Please 'make config' again
.endif
.endif
.if !defined(WITHOUT_TIFF)
LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff
CONFIGURE_ARGS+= --with-libtiff=${LOCALBASE}
.else
CONFIGURE_ARGS+= --with-libtiff=internal
.endif
.if defined(WITH_XERCES)