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

Fix a compilation error when A4 is defined.

Browse source 
PR:		30522
Submitted by:	KATO Tsuguru <tkato@prontomail.com>
This commit is contained in:
Akinori MUSHA 2001-09-12 17:05:47 +00:00
parent 3e22c57c7c
commit 39f9c8670a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=47762
4 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
print/ghostscript-gnu/Makefile
View file

@ -47,7 +47,7 @@ MLINKS= gslp.1 gsbj.1 \
ps2pdf.1 ps2pdf13.1
.if defined(A4)
CFLAGS+= -DA4
MAKE_ENV= A4="${A4}"
.endif
.if !defined(WITHOUT_X11)

19
print/ghostscript-gnu/files/patch-src:unix-gcc.mak
View file

@ -1,5 +1,5 @@
--- src/unix-gcc.mak.orig Tue Jun 5 16:54:10 2001
+++ src/unix-gcc.mak Fri Jun 15 04:11:50 2001
+++ src/unix-gcc.mak Wed Sep 12 22:41:20 2001
@@ -27,14 +27,15 @@
# source, generated intermediate file, and object directories
# for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@ -90,16 +90,21 @@
# Define the name of the linker for the final link step.
# Normally this is the same as the C compiler.
@@ -218,7 +219,7 @@
@@ -216,9 +217,11 @@
# 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=
+ifdef A4
+XCFLAGS=-DA4
+endif
-CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
+#CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
+CFLAGS+=$(XCFLAGS)
# Define platform flags for ld.
# SunOS 4.n may need -Bstatic.
@@ -227,7 +228,7 @@
@@ -227,7 +230,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.
@ -108,7 +113,7 @@
LDFLAGS=$(XLDFLAGS) -fno-common
@@ -260,7 +261,7 @@
@@ -260,7 +263,7 @@
# Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
# not in $(XINCLUDE).
@ -117,7 +122,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
@@ -272,12 +273,12 @@
@@ -272,12 +275,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

2
print/ghostscript7/Makefile
View file

@ -47,7 +47,7 @@ MLINKS= gslp.1 gsbj.1 \
ps2pdf.1 ps2pdf13.1
.if defined(A4)
CFLAGS+= -DA4
MAKE_ENV= A4="${A4}"
.endif
.if !defined(WITHOUT_X11)

19
print/ghostscript7/files/patch-src:unix-gcc.mak
View file

@ -1,5 +1,5 @@
--- src/unix-gcc.mak.orig Tue Jun 5 16:54:10 2001
+++ src/unix-gcc.mak Fri Jun 15 04:11:50 2001
+++ src/unix-gcc.mak Wed Sep 12 22:41:20 2001
@@ -27,14 +27,15 @@
# source, generated intermediate file, and object directories
# for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@ -90,16 +90,21 @@
# Define the name of the linker for the final link step.
# Normally this is the same as the C compiler.
@@ -218,7 +219,7 @@
@@ -216,9 +217,11 @@
# 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=
+ifdef A4
+XCFLAGS=-DA4
+endif
-CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
+#CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
+CFLAGS+=$(XCFLAGS)
# Define platform flags for ld.
# SunOS 4.n may need -Bstatic.
@@ -227,7 +228,7 @@
@@ -227,7 +230,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.
@ -108,7 +113,7 @@
LDFLAGS=$(XLDFLAGS) -fno-common
@@ -260,7 +261,7 @@
@@ -260,7 +263,7 @@
# Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
# not in $(XINCLUDE).
@ -117,7 +122,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
@@ -272,12 +273,12 @@
@@ -272,12 +275,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