diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2018-06-02 22:27:42 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2018-06-02 22:27:42 +0000 |
| commit | 481fec5d6e345c317091b3b478244e33add2595b (patch) | |
| tree | 6be673d60b50569f019d2a70f11adf95ad91dfb2 /graphics/leptonica | |
| parent | 2a51cfce9896a427e2ee3708dc407711380bef06 (diff) | |
| download | ports-481fec5d6e345c317091b3b478244e33add2595b.tar.gz ports-481fec5d6e345c317091b3b478244e33add2595b.zip | |
Fix and remove unnecessary CONFLICTS_BUILD=openjpeg15
The build fails if you have openjpeg15 installed.
It was caused by the order of include paths.
/usr/local/include/openjpeg.h (from openjpeg15) will be used instead of /usr/local/include/openjpeg-2.3/openjpeg.h (from openjpeg 2.3.0)
-I. -I.. -I/usr/local/include/libpng16 -I/usr/local/include -I/usr/local/include -I/usr/local/include -I/usr/local/include/openjpeg-2.3 -I/usr/local/include
Notified by: Walter Schwarzenfeld <w.schwarzenfeld@utanet.at>
Approved by: portmgr (blanket)
Notes
Notes:
svn path=/head/; revision=471431
Diffstat (limited to 'graphics/leptonica')
| -rw-r--r-- | graphics/leptonica/Makefile | 1 | ||||
| -rw-r--r-- | graphics/leptonica/files/patch-src-Makefile.am | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/graphics/leptonica/Makefile b/graphics/leptonica/Makefile index af5a027e120e..5d65879a516b 100644 --- a/graphics/leptonica/Makefile +++ b/graphics/leptonica/Makefile @@ -17,7 +17,6 @@ LIB_DEPENDS= libgif.so:graphics/giflib \ LICENSE_FILE= leptonica-license.txt CONFLICTS= leptonlib-[0-9]* -CONFLICTS_BUILD= openjpeg15 USES= autoreconf jpeg libtool pathfix pkgconfig diff --git a/graphics/leptonica/files/patch-src-Makefile.am b/graphics/leptonica/files/patch-src-Makefile.am new file mode 100644 index 000000000000..e7cbe0b53f27 --- /dev/null +++ b/graphics/leptonica/files/patch-src-Makefile.am @@ -0,0 +1,9 @@ +--- src/Makefile.am.orig 2018-05-02 22:12:19 UTC ++++ src/Makefile.am +@@ -1,5 +1,5 @@ + AM_CFLAGS = $(DEBUG_FLAGS) +-AM_CPPFLAGS = $(ZLIB_CFLAGS) $(LIBPNG_CFLAGS) $(JPEG_CFLAGS) $(LIBTIFF_CFLAGS) $(LIBWEBP_CFLAGS) $(LIBJP2K_CFLAGS) ++AM_CPPFLAGS = $(LIBJP2K_CFLAGS) $(ZLIB_CFLAGS) $(LIBPNG_CFLAGS) $(JPEG_CFLAGS) $(LIBTIFF_CFLAGS) $(LIBWEBP_CFLAGS) + + lib_LTLIBRARIES = liblept.la + liblept_la_LIBADD = $(LIBM) $(ZLIB_LIBS) $(LIBPNG_LIBS) $(JPEG_LIBS) $(GIFLIB_LIBS) $(LIBTIFF_LIBS) $(LIBWEBP_LIBS) $(LIBJP2K_LIBS) $(GDI_LIBS) |