sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build on systems which already have graphics/openjpeg in LOCALBASE.

Browse source
This commit is contained in:
Hiroki Sato 2012-02-13 21:48:19 +00:00
parent d32de4623d
commit 45b081ac33
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=291310
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
print/ghostscript9/Makefile
View file

@ -59,6 +59,8 @@ CONFIGURE_ARGS= --disable-compile-inits \
CPPFLAGS+= -DUPD_SIGNAL=0 -I. \ CPPFLAGS+= -DUPD_SIGNAL=0 -I. \
-I${WRKSRC}/lcms/include \ -I${WRKSRC}/lcms/include \
-I${LOCALBASE}/include/libpng \ -I${LOCALBASE}/include/libpng \
-I${WRKSRC}/openjpeg/libopenjpeg \
-I${WRKSRC}/openjpeg \
-I${LOCALBASE}/include -I${LOCALBASE}/include
XCFLAGS= ${PTHREAD_CFLAGS} XCFLAGS= ${PTHREAD_CFLAGS}
XLDFLAGS= ${PTHREAD_LIBS} XLDFLAGS= ${PTHREAD_LIBS}

6
print/ghostscript9/files/patch-base-openjpeg.mak
View file

@ -1,11 +1,11 @@
--- base/openjpeg.mak.orig 2012-02-13 10:49:36.000000000 +0900 --- base/openjpeg.mak.orig 2012-02-08 17:48:48.000000000 +0900
+++ base/openjpeg.mak 2012-02-13 10:57:41.000000000 +0900 +++ base/openjpeg.mak 2012-02-14 06:40:56.000000000 +0900
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
$(SETMOD) $(OPEN_JPEG_GEN)openjpeg_0 $(open_jpeg_OBJS) $(SETMOD) $(OPEN_JPEG_GEN)openjpeg_0 $(open_jpeg_OBJS)
# define our specific compiler # define our specific compiler
-OPEN_JPEG_CC=$(CC) $(CFLAGS) $(D_)OPJ_STATIC$(_D) $(I_)$(OPEN_JPEG_GEN)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(JPXCF_) -OPEN_JPEG_CC=$(CC) $(CFLAGS) $(D_)OPJ_STATIC$(_D) $(I_)$(OPEN_JPEG_GEN)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(JPXCF_)
+OPEN_JPEG_CC=$(CC) $(JPX_CFLAGS) $(CFLAGS) $(D_)OPJ_STATIC$(_D) $(I_)$(OPEN_JPEG_GEN)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(JPXCF_) +OPEN_JPEG_CC=$(CC) $(JPX_CFLAGS) $(I_)$(JPX_OPENJPEG_I_)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(CFLAGS) $(D_)OPJ_STATIC$(_D) $(I_)$(OPEN_JPEG_GEN)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(JPXCF_)
OPEN_JPEG_O=$(O_)$(OPEN_JPEG_OBJ)$(OPEN_JPEG_PREFIX) OPEN_JPEG_O=$(O_)$(OPEN_JPEG_OBJ)$(OPEN_JPEG_PREFIX)
OPEN_JPEG_DEP=$(AK) $(OPEN_JPEG_MAK) OPEN_JPEG_DEP=$(AK) $(OPEN_JPEG_MAK)