diff options
Diffstat (limited to 'print/ghostscript-gpl/files/patch-src:unix-gcc.mak')
| -rw-r--r-- | print/ghostscript-gpl/files/patch-src:unix-gcc.mak | 63 |
1 files changed, 46 insertions, 17 deletions
diff --git a/print/ghostscript-gpl/files/patch-src:unix-gcc.mak b/print/ghostscript-gpl/files/patch-src:unix-gcc.mak index ddc62984a8a9..fe6c53b5c5cc 100644 --- a/print/ghostscript-gpl/files/patch-src:unix-gcc.mak +++ b/print/ghostscript-gpl/files/patch-src:unix-gcc.mak @@ -1,6 +1,6 @@ ---- src/unix-gcc.mak.orig Fri Jul 7 06:32:50 2006 -+++ src/unix-gcc.mak Fri Mar 23 14:44:08 2007 -@@ -21,15 +21,16 @@ +--- src/unix-gcc.mak.orig Sat May 12 02:02:29 2007 ++++ src/unix-gcc.mak Fri May 25 04:03:33 2007 +@@ -21,15 +21,17 @@ # source, generated intermediate file, and object directories # for the graphics library (GL) and the PostScript/PDF interpreter (PS). @@ -23,10 +23,11 @@ +PSRESDIR=${.CURDIR}/Resource +PSGENDIR=${.CURDIR}/obj +PSOBJDIR=${.CURDIR}/obj ++CONTRIBDIR=${.CURDIR}/contrib # Do not edit the next group of lines. -@@ -48,11 +49,10 @@ +@@ -48,11 +50,10 @@ # the directories also define the default search path for the # initialization files (gs_*.ps) and the fonts. @@ -41,7 +42,7 @@ exec_prefix = $(prefix) bindir = $(exec_prefix)/bin scriptdir = $(bindir) -@@ -143,7 +143,7 @@ +@@ -143,7 +144,7 @@ # some older JPEG streams that violate the standard. If the JPEG # library built from local sources, the patch will be applied. @@ -50,7 +51,7 @@ JPEG_NAME=jpeg # Define the directory where the PNG library sources are stored, -@@ -158,7 +158,7 @@ +@@ -158,7 +159,7 @@ # what its name is. # See gs.mak and Make.htm for more information. @@ -59,7 +60,7 @@ LIBPNG_NAME=png # Define the directory where the zlib sources are stored. -@@ -170,7 +170,7 @@ +@@ -170,7 +171,7 @@ # what its name is (usually libz, but sometimes libgz). # See gs.mak and Make.htm for more information. @@ -68,7 +69,7 @@ #ZLIB_NAME=gz ZLIB_NAME=z -@@ -179,6 +179,14 @@ +@@ -179,6 +180,14 @@ JBIG2_LIB=jbig2dec JBIG2SRCDIR=jbig2dec @@ -83,7 +84,7 @@ # Define the directory where the icclib source are stored. # See icclib.mak for more information -@@ -202,7 +210,7 @@ +@@ -202,7 +211,7 @@ # Define the name of the C compiler. @@ -92,7 +93,7 @@ # Define the name of the linker for the final link step. # Normally this is the same as the C compiler. -@@ -219,9 +227,9 @@ +@@ -219,9 +228,9 @@ # Define the added flags for standard, debugging, profiling # and shared object builds. @@ -105,25 +106,25 @@ CFLAGS_SO=-fPIC # Define the other compilation flags. Add at most one of the following: -@@ -235,7 +243,7 @@ +@@ -235,7 +244,7 @@ # We don't include -ansi, because this gets in the way of the platform- # specific stuff that <math.h> typically needs; nevertheless, we expect # gcc to accept ANSI-style function prototypes and function definitions. -XCFLAGS= -+XCFLAGS+=-I${.CURDIR}/jasper/src/libjasper/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include ++XCFLAGS+=-I${JPXSRCDIR}/src/libjasper/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS) -@@ -246,7 +254,7 @@ +@@ -246,7 +255,7 @@ # -R /usr/local/xxx/lib:/usr/local/lib # giving the full path names of the shared library directories. # XLDFLAGS can be set from the command line. -XLDFLAGS= -+XLDFLAGS=-L${LOCALBASE}/lib ++XLDFLAGS+=-L${LOCALBASE}/lib LDFLAGS=$(XLDFLAGS) -@@ -279,7 +287,7 @@ +@@ -279,7 +288,7 @@ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11, # not in $(XINCLUDE). @@ -132,7 +133,7 @@ # Define the directory/ies and library names for the X11 library files. # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH -@@ -291,12 +299,12 @@ +@@ -291,12 +300,12 @@ # Solaris and other SVR4 systems with dynamic linking probably want #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib # X11R6 (on any platform) may need @@ -148,7 +149,27 @@ # Define whether this platform has floating point hardware: # FPU_TYPE=2 means floating point is faster than fixed point. -@@ -447,6 +455,9 @@ +@@ -314,16 +323,16 @@ + + # If POSIX sync primitives are used, also change the STDLIBS to include + # the pthread library. +-#SYNC=posync ++SYNC=posync + + # Default is No sync primitives since some platforms don't have it (HP-UX) +-SYNC=nosync ++#SYNC=nosync + + # ------ Devices and features ------ # + + # Choose the language feature(s) to include. See gs.mak for details. + +-FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev $(PSD)fapi.dev ++FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev $(PSD)fapi.dev $(PSD)jbig2.dev $(PSD)jpx.dev + #FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev + # The following is strictly for testing. + FEATURE_DEVS_ALL=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)rasterop.dev $(PSD)double.dev $(PSD)trapping.dev $(PSD)stocht.dev $(GLD)pipe.dev +@@ -447,6 +456,9 @@ include $(GLSRCDIR)/zlib.mak include $(GLSRCDIR)/libpng.mak include $(GLSRCDIR)/jbig2.mak @@ -158,3 +179,11 @@ include $(GLSRCDIR)/icclib.mak include $(GLSRCDIR)/ijs.mak include $(GLSRCDIR)/devs.mak +@@ -456,6 +468,7 @@ + include $(GLSRCDIR)/unix-dll.mak + include $(GLSRCDIR)/unix-end.mak + include $(GLSRCDIR)/unixinst.mak ++include $(CONTRIBDIR)/contrib.mak + + # This has to come last so it won't be taken as the default target. + $(AK): |