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 | 80 |
1 files changed, 58 insertions, 22 deletions
diff --git a/print/ghostscript-gpl/files/patch-src:unix-gcc.mak b/print/ghostscript-gpl/files/patch-src:unix-gcc.mak index fe6c53b5c5cc..15462223d8b1 100644 --- a/print/ghostscript-gpl/files/patch-src:unix-gcc.mak +++ b/print/ghostscript-gpl/files/patch-src:unix-gcc.mak @@ -1,5 +1,5 @@ ---- src/unix-gcc.mak.orig Sat May 12 02:02:29 2007 -+++ src/unix-gcc.mak Fri May 25 04:03:33 2007 +--- src/unix-gcc.mak.orig Tue Jul 31 05:13:56 2007 ++++ src/unix-gcc.mak Fri Aug 10 22:01:41 2007 @@ -21,15 +21,17 @@ # source, generated intermediate file, and object directories # for the graphics library (GL) and the PostScript/PDF interpreter (PS). @@ -42,7 +42,24 @@ exec_prefix = $(prefix) bindir = $(exec_prefix)/bin scriptdir = $(bindir) -@@ -143,7 +144,7 @@ +@@ -62,6 +63,7 @@ + datadir = $(prefix)/share + gsdir = $(datadir)/ghostscript + gsdatadir = $(gsdir)/$(GS_DOT_VERSION) ++gssharedir = $(libdir)/ghostscript/$(GS_DOT_VERSION) + + docdir=$(gsdatadir)/doc + exdir=$(gsdatadir)/examples +@@ -108,7 +110,7 @@ + # -DHAVE_HYPOT + # use the system hypot() call + +-CAPOPT= -DHAVE_MKSTEMP ++CAPOPT= -DHAVE_MKSTEMP -DHAVE_HYPOT + + # Define the name of the executable file. + +@@ -143,7 +145,7 @@ # some older JPEG streams that violate the standard. If the JPEG # library built from local sources, the patch will be applied. @@ -51,7 +68,7 @@ JPEG_NAME=jpeg # Define the directory where the PNG library sources are stored, -@@ -158,7 +159,7 @@ +@@ -158,7 +160,7 @@ # what its name is. # See gs.mak and Make.htm for more information. @@ -60,7 +77,7 @@ LIBPNG_NAME=png # Define the directory where the zlib sources are stored. -@@ -170,7 +171,7 @@ +@@ -170,7 +172,7 @@ # what its name is (usually libz, but sometimes libgz). # See gs.mak and Make.htm for more information. @@ -69,7 +86,7 @@ #ZLIB_NAME=gz ZLIB_NAME=z -@@ -179,6 +180,14 @@ +@@ -179,6 +181,14 @@ JBIG2_LIB=jbig2dec JBIG2SRCDIR=jbig2dec @@ -84,7 +101,7 @@ # Define the directory where the icclib source are stored. # See icclib.mak for more information -@@ -202,7 +211,7 @@ +@@ -207,7 +217,7 @@ # Define the name of the C compiler. @@ -93,29 +110,30 @@ # Define the name of the linker for the final link step. # Normally this is the same as the C compiler. -@@ -219,9 +228,9 @@ +@@ -224,10 +234,10 @@ # Define the added flags for standard, debugging, profiling # and shared object builds. -CFLAGS_STANDARD=-O2 --CFLAGS_DEBUG=-g -O0 --CFLAGS_PROFILE=-pg -O2 +CFLAGS_STANDARD?=-O2 -+CFLAGS_DEBUG=-g -+CFLAGS_PROFILE=-pg - CFLAGS_SO=-fPIC + CFLAGS_DEBUG=-g -O0 + CFLAGS_PROFILE=-pg -O2 +-CFLAGS_SO=-fPIC -shared ++CFLAGS_SO=-fPIC # Define the other compilation flags. Add at most one of the following: -@@ -235,7 +244,7 @@ + # -DBSD4_2 for 4.2bsd systems. +@@ -240,7 +250,8 @@ # 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${JPXSRCDIR}/src/libjasper/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include +-XCFLAGS=-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\"$(gssharedir)\" ++XCFLAGS+=-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\"$(gssharedir)\" ++XCFLAGS+=-DUPD_SIGNAL=0 -I${JPXSRCDIR}/src/libjasper/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS) -@@ -246,7 +255,7 @@ +@@ -251,7 +262,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. @@ -124,7 +142,16 @@ LDFLAGS=$(XLDFLAGS) -@@ -279,7 +288,7 @@ +@@ -262,7 +273,7 @@ + # Solaris may need -lnsl -lsocket -lposix4. + # (Libraries required by individual drivers are handled automatically.) + +-EXTRALIBS=-rdynamic -ldl ++EXTRALIBS+=-Wl,-export-dynamic + + # Define the standard libraries to search at the end of linking. + # Most platforms require -lpthread for the POSIX threads library; +@@ -284,7 +295,7 @@ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11, # not in $(XINCLUDE). @@ -133,7 +160,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 +300,12 @@ +@@ -296,12 +307,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 @@ -149,7 +176,7 @@ # Define whether this platform has floating point hardware: # FPU_TYPE=2 means floating point is faster than fixed point. -@@ -314,16 +323,16 @@ +@@ -319,16 +330,16 @@ # If POSIX sync primitives are used, also change the STDLIBS to include # the pthread library. @@ -169,7 +196,16 @@ #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 @@ +@@ -418,7 +429,7 @@ + DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev + + # Shared library target to build. +-GS_SHARED_OBJS=$(GLOBJDIR)/X11.so $(GLOBJDIR)/lvga256.so $(GLOBJDIR)/vgalib.so ++#GS_SHARED_OBJS=$(GLOBJDIR)/X11.so $(GLOBJDIR)/lvga256.so $(GLOBJDIR)/vgalib.so + #GS_SHARED_OBJS=$(GLOBJDIR)/X11.so + + # ---------------------------- End of options --------------------------- # +@@ -457,6 +468,9 @@ include $(GLSRCDIR)/zlib.mak include $(GLSRCDIR)/libpng.mak include $(GLSRCDIR)/jbig2.mak @@ -179,7 +215,7 @@ include $(GLSRCDIR)/icclib.mak include $(GLSRCDIR)/ijs.mak include $(GLSRCDIR)/devs.mak -@@ -456,6 +468,7 @@ +@@ -466,6 +480,7 @@ include $(GLSRCDIR)/unix-dll.mak include $(GLSRCDIR)/unix-end.mak include $(GLSRCDIR)/unixinst.mak |