diff options
| author | glarkin <glarkin@FreeBSD.org> | 2009-11-16 02:54:23 +0800 |
|---|---|---|
| committer | glarkin <glarkin@FreeBSD.org> | 2009-11-16 02:54:23 +0800 |
| commit | 6a33a2bee78274042aa6b552b885a9b92ed67226 (patch) | |
| tree | e32a77c1c3170b78d8a21223582eab0ebd02ff26 /graphics | |
| parent | 8ff2693e09ff172104d8bc9c7e95e0f94199bb44 (diff) | |
| download | freebsd-ports-gnome-6a33a2bee78274042aa6b552b885a9b92ed67226.tar.gz freebsd-ports-gnome-6a33a2bee78274042aa6b552b885a9b92ed67226.tar.zst freebsd-ports-gnome-6a33a2bee78274042aa6b552b885a9b92ed67226.zip | |
- Added explicit X11 support option
- 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>
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/GraphicsMagick12/Makefile | 9 | ||||
| -rw-r--r-- | graphics/GraphicsMagick13/Makefile | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile index 96016abe3993..008ebd381ee7 100644 --- a/graphics/GraphicsMagick12/Makefile +++ b/graphics/GraphicsMagick12/Makefile @@ -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 diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile index ebb5783ee2a7..be6c417a9093 100644 --- a/graphics/GraphicsMagick13/Makefile +++ b/graphics/GraphicsMagick13/Makefile @@ -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 |