mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00
Code Issues Releases Activity

- Added explicit X11 support option

Browse Source 
- Fixed LDFLAGS handling when OpenMP is enabled and X11 support is disabled.
  The previous way it was handled caused optional image support (JPG, PNG,
  etc.) to fail

NOTE: graphics/GraphicsMagick is not affected since it doesn't have OpenMP
      support

PR:		ports/139975
Submitted by:	Marcin Wisnicki <mwisnicki+freebsd@gmail.com>
This commit is contained in:
Greg Larkin 2009-11-15 18:54:23 +00:00
parent 7e32706488
commit 91d039353e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=244299
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
graphics/GraphicsMagick12/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= GraphicsMagick
PORTVERSION= 1.2.9
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF \
ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.2/
@ -28,6 +29,7 @@ OPTIONS= Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \
DPS "Enable Display Ghostscript support" on \
OPENMP "Enable OpenMP support" off \
SSE "Enable SSE opcodes on supported CPUs" off \
X11 "Enable X11 support" on \
TESTS "Run bundled self-tests after build" on
USE_ICONV= yes
@ -52,7 +54,8 @@ USE_LDCONFIG= yes
ALL_TARGET= -j`${SYSCTL} -n hw.ncpu`
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
LDFLAGS="${CONFIGURE_LDFLAGS}"
CONFIGURE_LDFLAGS=-L${LOCALBASE}/lib
test check:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
@ -96,7 +99,7 @@ CONFIGURE_ARGS+= --without-dps
IGNORE= does not support OpenMP on FreeBSD version ${OSVERSION}
.endif
CONFIGURE_ENV+= LDFLAGS=${PTHREAD_LIBS}
CONFIGURE_LDFLAGS+= ${PTHREAD_LIBS}
CONFIGURE_ARGS+= --with-threads --enable-openmp
.else
CONFIGURE_ARGS+= --without-threads --disable-openmp
@ -111,7 +114,7 @@ WINDOWS_FONT_DIR=${LOCALBASE}/lib/X11/fonts/webfonts
CONFIGURE_ARGS+= --with-windows-font-dir="${WINDOWS_FONT_DIR}"
.endif
.if defined(WITHOUT_X11)
.if !defined(WITH_X11)
PKGNAMESUFFIX+= -nox11
CONFIGURE_ARGS+=--without-x
.endif

9
graphics/GraphicsMagick13/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= GraphicsMagick
PORTVERSION= 1.3.7
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF \
ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
@ -30,6 +31,7 @@ OPTIONS= Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \
DPS "Enable Display Ghostscript support" on \
OPENMP "Enable OpenMP support" on \
SSE "Enable SSE opcodes on supported CPUs" off \
X11 "Enable X11 support" on \
TESTS "Run bundled self-tests after build" on
USE_ICONV= yes
@ -54,7 +56,8 @@ USE_LDCONFIG= yes
ALL_TARGET= -j`${SYSCTL} -n hw.ncpu`
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
LDFLAGS="${CONFIGURE_LDFLAGS}"
CONFIGURE_LDFLAGS=-L${LOCALBASE}/lib
test check:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
@ -98,7 +101,7 @@ CONFIGURE_ARGS+= --without-dps
IGNORE= does not support OpenMP on FreeBSD version ${OSVERSION}
.endif
CONFIGURE_ENV+= LDFLAGS=${PTHREAD_LIBS}
CONFIGURE_LDFLAGS+= ${PTHREAD_LIBS}
CONFIGURE_ARGS+= --with-threads --enable-openmp --disable-openmp-slow
.else
CONFIGURE_ARGS+= --without-threads --disable-openmp
@ -113,7 +116,7 @@ WINDOWS_FONT_DIR=${LOCALBASE}/lib/X11/fonts/webfonts
CONFIGURE_ARGS+= --with-windows-font-dir="${WINDOWS_FONT_DIR}"
.endif
.if defined(WITHOUT_X11)
.if !defined(WITH_X11)
PKGNAMESUFFIX+= -nox11
CONFIGURE_ARGS+=--without-x
.endif