Attachment #116180 for bug #158100

View | Details | Raw Unified | Return to bug 158100 | Differences between
Collapse All | Expand All




*** Makefile.orig	Sun Dec 21 11:23:51 2003
--- Makefile	Tue Jun 21 11:49:29 2011
***************
*** 28,34 ****
  #b	= -UUNIXPC
  ##  Define HAVEMEMCMP if you have memcmp otherwise assumes bcmp
  c	= -DHAVEMEMCMP
  ##  Define DEFFMTCMD to being how to format the media you use the most
  ##		This is the DEFault FoRMat CoManD. 

  ##  Define LONGZFILE if you want .Z to be tagged on the end of a 14 char
  ##	file name (or longer for BSD) in the archive when the file is compressed
  #e	= -DLONGZFILE
--- 28,34 ----
  ##  Define HAVE_LCHOWN is the system has an lchown call (like chown but does
  ##  not follow symlinks)
  e2      = -DHAVE_LCHOWN
  
  ##  Define PRG_COMPRESS to get something other than `gzip'.
  # you need to edit compfile.c (-G option) if you change this line.
! f	= -DPRG_COMPRESS='"gzip"'
  
  ## Define HAVEFNMATCH if you want to use the gnu fnmatch() routine for
  # -y -Y -w -W matching.
  # If it is not defined, a primitive replacement match routine is used that
  # only supports patterns of the form "cccc" and "cccc*".  Make sure that
  # you change the manual page in this case.
  
  g	= -DHAVEFNMATCH
  
  # fnmatch() is in the gnu C library, so it is directly available on
  # Linux.  If your system (e.g. SCO) does not have the gnu C library,
  # unpack the archive gnu.fnmatch.tar.gz and uncomment the following
  # two lines:
  
--- 26,61 ----
  #b	= -UUNIXPC
  ##  Define HAVEMEMCMP if you have memcmp otherwise assumes bcmp
  c	= -DHAVEMEMCMP
  ##  Define DEFFMTCMD to being how to format the media you use the most
  ##		This is the DEFault FoRMat CoManD. 

  ##  Define LONGZFILE if you want .Z to be tagged on the end of a 14 char
  ##	file name (or longer for BSD) in the archive when the file is compressed
  #e	= -DLONGZFILE
***************
*** 39,45 ****
  
  ##  Define PRG_COMPRESS to get something other than `gzip'.
  # you need to edit compfile.c (-G option) if you change this line.
! f	= -DPRG_COMPRESS='"gzip"'
  
  ## Define HAVEFNMATCH if you want to use the gnu fnmatch() routine for
  # -y -Y -w -W matching.
--- 39,45 ----
  
  ##  Define PRG_COMPRESS to get something other than `gzip'.
  # you need to edit compfile.c (-G option) if you change this line.

  
  ## Define HAVEFNMATCH if you want to use the gnu fnmatch() routine for
  # -y -Y -w -W matching.
***************
*** 49,54 ****
--- 49,59 ----
  
  g	= -DHAVEFNMATCH
  

  # fnmatch() is in the gnu C library, so it is directly available on
  # Linux.  If your system (e.g. SCO) does not have the gnu C library,
  # unpack the archive gnu.fnmatch.tar.gz and uncomment the following
  # two lines:
  
***************
*** 71,81 ****
  
  # even more warnings flags..
  MW=
  #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations
  

  LDFLAGS =
  
  afio : afio.o compfile.o exten.o match.o $M
--- 76,88 ----
  
--- 74,91 ----
  
  # even more warnings flags..
  MW=
  #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations
  

! CFLAGS1 = -fomit-frame-pointer -fno-strength-reduce
  
! #CC=gcc
! CC=cc
  
! #CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I
! CFLAGS += ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $h $I
  LDFLAGS =
  
  afio : afio.o compfile.o exten.o match.o $M
  	${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio
  
***************
*** 88,95 ****
  	rm -f regtest/cmpstat regtest/makesparse
  	rm -f regtest/statsize regtest/statsize64
  	cd regtest; /bin/sh regtest.clean
  
  install: afio

  
  # generate default list of -E extensions from manpage
  # note: on sun, I had to change awk command below to nawk or gawk
--- 95,103 ----
  exten_default.h : afio.1
--- 94,106 ----
  	rm -f regtest/cmpstat regtest/makesparse
  	rm -f regtest/statsize regtest/statsize64
  	cd regtest; /bin/sh regtest.clean
  
  install: afio

  
  # generate default list of -E extensions from manpage
  # note: on sun, I had to change awk command below to nawk or gawk
  # to get it to work.
  exten_default.h : afio.1

Return to bug 158100

Lines 1-9 Link Here

(-)files/patch-aa (-59 / +20 lines)
1	*** Makefile.orig Sun Dec 21 05:23:51 2003	1	*** Makefile.orig Sun Dec 21 11:23:51 2003
2	--- Makefile Sat Jan 21 17:34:53 2006	2	--- Makefile Tue Jun 21 11:49:29 2011
3	***************	3	***************
4	* 26,56 **	4	* 28,34 **
5	#b = -UUNIXPC
6	## Define HAVEMEMCMP if you have memcmp otherwise assumes bcmp
7	c = -DHAVEMEMCMP	5	c = -DHAVEMEMCMP
8	## Define DEFFMTCMD to being how to format the media you use the most	6	## Define DEFFMTCMD to being how to format the media you use the most
9	## This is the DEFault FoRMat CoManD.	7	## This is the DEFault FoRMat CoManD.
Lines 11-41 Link Here
11	## Define LONGZFILE if you want .Z to be tagged on the end of a 14 char	9	## Define LONGZFILE if you want .Z to be tagged on the end of a 14 char
12	## file name (or longer for BSD) in the archive when the file is compressed	10	## file name (or longer for BSD) in the archive when the file is compressed
13	#e = -DLONGZFILE	11	#e = -DLONGZFILE
14		12	--- 28,34 ----
15	## Define HAVE_LCHOWN is the system has an lchown call (like chown but does
16	## not follow symlinks)
17	e2 = -DHAVE_LCHOWN
18
19	## Define PRG_COMPRESS to get something other than `gzip'.
20	# you need to edit compfile.c (-G option) if you change this line.
21	! f = -DPRG_COMPRESS='"gzip"'
22
23	## Define HAVEFNMATCH if you want to use the gnu fnmatch() routine for
24	# -y -Y -w -W matching.
25	# If it is not defined, a primitive replacement match routine is used that
26	# only supports patterns of the form "cccc" and "cccc*". Make sure that
27	# you change the manual page in this case.
28
29	g = -DHAVEFNMATCH
30
31	# fnmatch() is in the gnu C library, so it is directly available on
32	# Linux. If your system (e.g. SCO) does not have the gnu C library,
33	# unpack the archive gnu.fnmatch.tar.gz and uncomment the following
34	# two lines:
35
36	--- 26,61 ----
37	#b = -UUNIXPC
38	## Define HAVEMEMCMP if you have memcmp otherwise assumes bcmp
39	c = -DHAVEMEMCMP	13	c = -DHAVEMEMCMP
40	## Define DEFFMTCMD to being how to format the media you use the most	14	## Define DEFFMTCMD to being how to format the media you use the most
41	## This is the DEFault FoRMat CoManD.	15	## This is the DEFault FoRMat CoManD.
Lines 43-52 Link Here
43	## Define LONGZFILE if you want .Z to be tagged on the end of a 14 char	17	## Define LONGZFILE if you want .Z to be tagged on the end of a 14 char
44	## file name (or longer for BSD) in the archive when the file is compressed	18	## file name (or longer for BSD) in the archive when the file is compressed
45	#e = -DLONGZFILE	19	#e = -DLONGZFILE
		20	***************
		21	* 39,45 **
46		22
47	## Define HAVE_LCHOWN is the system has an lchown call (like chown but does	23	## Define PRG_COMPRESS to get something other than `gzip'.
48	## not follow symlinks)	24	# you need to edit compfile.c (-G option) if you change this line.
49	e2 = -DHAVE_LCHOWN	25	! f = -DPRG_COMPRESS='"gzip"'
		26
		27	## Define HAVEFNMATCH if you want to use the gnu fnmatch() routine for
		28	# -y -Y -w -W matching.
		29	--- 39,45 ----
50		30
51	## Define PRG_COMPRESS to get something other than `gzip'.	31	## Define PRG_COMPRESS to get something other than `gzip'.
52	# you need to edit compfile.c (-G option) if you change this line.	32	# you need to edit compfile.c (-G option) if you change this line.
Lines 54-62 Link Here
54		34
55	## Define HAVEFNMATCH if you want to use the gnu fnmatch() routine for	35	## Define HAVEFNMATCH if you want to use the gnu fnmatch() routine for
56	# -y -Y -w -W matching.	36	# -y -Y -w -W matching.
57	# If it is not defined, a primitive replacement match routine is used that	37	***************
58	# only supports patterns of the form "cccc" and "cccc*". Make sure that	38	* 49,54 **
59	# you change the manual page in this case.	39	--- 49,59 ----
60		40
61	g = -DHAVEFNMATCH	41	g = -DHAVEFNMATCH
62		42
Lines 68-79 Link Here
68	# fnmatch() is in the gnu C library, so it is directly available on	48	# fnmatch() is in the gnu C library, so it is directly available on
69	# Linux. If your system (e.g. SCO) does not have the gnu C library,	49	# Linux. If your system (e.g. SCO) does not have the gnu C library,
70	# unpack the archive gnu.fnmatch.tar.gz and uncomment the following	50	# unpack the archive gnu.fnmatch.tar.gz and uncomment the following
71	# two lines:
72
73	***************	51	***************
74	* 69,83 **	52	* 71,81 **
75
76	# even more warnings flags..
77	MW=	53	MW=
78	#MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations	54	#MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations
79		55
Lines 85-95 Link Here
85	LDFLAGS =	61	LDFLAGS =
86		62
87	afio : afio.o compfile.o exten.o match.o $M	63	afio : afio.o compfile.o exten.o match.o $M
88	${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio	64	--- 76,88 ----
89
90	--- 74,91 ----
91
92	# even more warnings flags..
93	MW=	65	MW=
94	#MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations	66	#MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations
95		67
Lines 97-115 Link Here
97	! CFLAGS1 = -fomit-frame-pointer -fno-strength-reduce	69	! CFLAGS1 = -fomit-frame-pointer -fno-strength-reduce
98		70
99	! #CC=gcc	71	! #CC=gcc
100	! CC=cc
101		72
102	! #CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I	73	! #CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I
103	! CFLAGS += ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $h $I	74	! CFLAGS += ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $h $I
104	LDFLAGS =	75	LDFLAGS =
105		76
106	afio : afio.o compfile.o exten.o match.o $M	77	afio : afio.o compfile.o exten.o match.o $M
107	${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio
108
109	***************	78	***************
110	* 86,97 **	79	* 88,95 **
111	rm -f regtest/cmpstat regtest/makesparse
112	rm -f regtest/statsize regtest/statsize64
113	cd regtest; /bin/sh regtest.clean	80	cd regtest; /bin/sh regtest.clean
114		81
115	install: afio	82	install: afio
Lines 118-128 Link Here
118		85
119	# generate default list of -E extensions from manpage	86	# generate default list of -E extensions from manpage
120	# note: on sun, I had to change awk command below to nawk or gawk	87	# note: on sun, I had to change awk command below to nawk or gawk
121	# to get it to work.	88	--- 95,103 ----
122	exten_default.h : afio.1
123	--- 94,106 ----
124	rm -f regtest/cmpstat regtest/makesparse
125	rm -f regtest/statsize regtest/statsize64
126	cd regtest; /bin/sh regtest.clean	89	cd regtest; /bin/sh regtest.clean
127		90
128	install: afio	91	install: afio
Lines 132-136 Link Here
132		95
133	# generate default list of -E extensions from manpage	96	# generate default list of -E extensions from manpage
134	# note: on sun, I had to change awk command below to nawk or gawk	97	# note: on sun, I had to change awk command below to nawk or gawk
135	# to get it to work.
136	exten_default.h : afio.1