[gentoo-commits] gentoo-x86 commit in dev-lang/qu-prolog/files: qu-prolog-8.5-portage.patch qu-prolog-8.5-gcc4.3.patch - gentoo-commits

From:	"Keri Harris (keri)" <keri@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in dev-lang/qu-prolog/files: qu-prolog-8.5-portage.patch qu-prolog-8.5-gcc4.3.patch
Date:	Wed, 02 Jul 2008 07:24:32
Message-Id:	`E1KDwhW-0000GP-7z@stork.gentoo.org`

1

keri        08/07/02 07:24:26

2

3

  Added:                qu-prolog-8.5-portage.patch

4

                        qu-prolog-8.5-gcc4.3.patch

5

  Log:

6

  Version bump.

7

  (Portage version: 2.1.5.5)

8

9

Revision  Changes    Path

10

1.1                  dev-lang/qu-prolog/files/qu-prolog-8.5-portage.patch

11

12

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.5-portage.patch?rev=1.1&view=markup

13

plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.5-portage.patch?rev=1.1&content-type=text/plain

14

15

Index: qu-prolog-8.5-portage.patch

16

===================================================================

17

diff -ur qp8.5.orig/Makefile.in qp8.5/Makefile.in

18

--- qp8.5.orig/Makefile.in	2008-06-17 10:17:22.000000000 +1200

19

+++ qp8.5/Makefile.in	2008-06-28 14:16:55.000000000 +1200

20

@@ -14,6 +14,7 @@

21

 # objects.

22

#

23

24

+export QPHOME	= @prefix@/lib/qu-prolog

25

 export QPBIN	= @QPHOME@/bin

26

27

28

diff -ur qp8.5.orig/bin/qc.in qp8.5/bin/qc.in

29

--- qp8.5.orig/bin/qc.in	2007-08-01 12:23:42.000000000 +1200

30

+++ qp8.5/bin/qc.in	2008-06-28 14:16:55.000000000 +1200

31

@@ -47,24 +47,25 @@

32

#

33

 # location of Qu-Prolog project

34

#

35

-PATH=@QPHOME@/bin:$PATH

36

+QPHOME=@libdir@/qu-prolog

37

+PATH=$QPHOME/bin:$PATH

38

39

#

40

 # names of Qu-Prolog binaries

41

#

42

-preprocess=@QPHOME@/bin/qppp

43

-expand=@QPHOME@/bin/qg

44

-compile=@QPHOME@/bin/qc1

45

+preprocess=qppp

46

+expand=qg

47

+compile=qc1

48

 compversion=qup

49

-assemble=@QPHOME@/bin/qa

50

-link=@QPHOME@/bin/ql

51

-execute=@QPHOME@/bin/qem

52

+assemble=qa

53

+link=ql

54

+execute=qem

55

56

#

57

 # Use the line below when dynamic search for libraries is implemented.

58

#

59

 # libqofiles=""

60

-libqofiles="@QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo"

61

+libqofiles="@QPHOME@/compiler/*.qo @QPHOME@/library/*.qo"

62

63

 qlfiles=""

64

 qlefiles=""

65

@@ -327,18 +328,7 @@

66

 	absexecfile=$execfile

67

;;

68

*)

69

-	currdir=`pwd`

70

-	case $currdir in

71

-	/u*)

72

-		abspath=`echo $currdir | sed "s,/u./$HOSTNAME/,/homes/,"`

73

-		;;

74

-	/tmp_mnt/*)

75

-		abspath=`echo $currdir | sed 's,/tmp_mnt/homes/[^/]*/,/homes/,'`

76

-		;;

77

-	*)

78

-		abspath=$currdir

79

-		;;

80

-	esac

81

+	abspath=`pwd`

82

 	absexecfile=$abspath/$execfile

83

;;

84

 esac

85

@@ -354,5 +344,8 @@

86

87

 # make executable file

88

89

-echo "exec $execute $Eoptions $lflag -Q '$savefile' \$* $*" >$execfile

90

+echo "QPPATH=@prefix@/bin:$QPHOME/bin" >$execfile

91

+echo "QPLIBPATH=$QPHOME/compiler:$QPHOME/library:"'$QPLIBPATH' >>$execfile

92

+echo "export QPPATH QPLIBPATH" >>$execfile

93

+echo "exec $execute $Eoptions $lflag -Q '$savefile' \$* $*" >>$execfile

94

 chmod a+x $execfile

95

diff -ur qp8.5.orig/prolog/compiler/Makefile.in qp8.5/prolog/compiler/Makefile.in

96

--- qp8.5.orig/prolog/compiler/Makefile.in	2008-06-17 10:17:26.000000000 +1200

97

+++ qp8.5/prolog/compiler/Makefile.in	2008-06-28 14:16:55.000000000 +1200

98

@@ -29,5 +29,5 @@

99

100

101

 %.qo: %.qs

102

-	$(COMPILE.qc) -c -o $@ $<

103

+	@QPHOME@/src/qa -i $< -o $@

104

105

diff -ur qp8.5.orig/prolog/library/Makefile.in qp8.5/prolog/library/Makefile.in

106

--- qp8.5.orig/prolog/library/Makefile.in	2008-06-17 10:17:26.000000000 +1200

107

+++ qp8.5/prolog/library/Makefile.in	2008-06-28 14:16:55.000000000 +1200

108

@@ -99,4 +99,4 @@

109

110

111

 %.qo: %.qs

112

-	$(COMPILE.qc) -c -o $@ $<

113

+	@QPHOME@/src/qa -i $< -o $@

114

diff -ur qp8.5.orig/prolog/qc1/Makefile.in qp8.5/prolog/qc1/Makefile.in

115

--- qp8.5.orig/prolog/qc1/Makefile.in	2008-06-17 10:17:26.000000000 +1200

116

+++ qp8.5/prolog/qc1/Makefile.in	2008-06-28 14:16:55.000000000 +1200

117

@@ -3,6 +3,7 @@

118

#

119

 PROGRAM		= @QPHOME@/bin/qc1.qup

120

121

+SAVEFILE	= qc1.qx

122

 SOURCES		= qc1.ql

123

124

 BASES		= $(basename $(SOURCES))

125

@@ -13,8 +14,12 @@

126

 all: $(PROGRAM)

127

128

 $(PROGRAM): $(OBJECTS)

129

-	$(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS)

130

+	@QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)

131

+	@echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)

132

+	@echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)

133

+	@echo "export QPPATH QPLIBPATH" >>$(PROGRAM)

134

+	@echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)

135

136

 %.qo: %.qs

137

-	$(COMPILE.qc) -c -o $@ $<

138

+	@QPHOME@/src/qa -i $< -o $@

139

140

diff -ur qp8.5.orig/prolog/qecat/Makefile.in qp8.5/prolog/qecat/Makefile.in

141

--- qp8.5.orig/prolog/qecat/Makefile.in	2008-06-17 10:17:26.000000000 +1200

142

+++ qp8.5/prolog/qecat/Makefile.in	2008-06-28 14:16:55.000000000 +1200

143

@@ -4,6 +4,7 @@

144

145

 PROGRAM		= $(QPBIN)/qecat

146

147

+SAVEFILE	= qecat.qx

148

 SOURCES		= qecat.ql

149

150

 BASES		= $(basename $(SOURCES))

151

@@ -14,9 +15,13 @@

152

 all: $(PROGRAM)

153

154

 $(PROGRAM): $(OBJECTS)

155

-	$(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS)

156

+	@QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)

157

+	@echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)

158

+	@echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)

159

+	@echo "export QPPATH QPLIBPATH" >>$(PROGRAM)

160

+	@echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)

161

162

163

 %.qo: %.qs

164

-	$(COMPILE.qc) -c -o $@ $<

165

+	@QPHOME@/src/qa -i $< -o $@

166

167

diff -ur qp8.5.orig/prolog/qg/Makefile.in qp8.5/prolog/qg/Makefile.in

168

--- qp8.5.orig/prolog/qg/Makefile.in	2008-06-17 10:17:26.000000000 +1200

169

+++ qp8.5/prolog/qg/Makefile.in	2008-06-28 14:16:55.000000000 +1200

170

@@ -4,6 +4,7 @@

171

172

 PROGRAM		= @QPHOME@/bin/qg

173

174

+SAVEFILE	= qg.qx

175

 SOURCES		= qg.ql

176

177

 BASES		= $(basename $(SOURCES))

178

@@ -14,9 +15,13 @@

179

 all: $(PROGRAM)

180

181

 $(PROGRAM): $(OBJECTS)

182

-	$(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS)

183

+	@QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)

184

+	@echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)

185

+	@echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)

186

+	@echo "export QPPATH QPLIBPATH" >>$(PROGRAM)

187

+	@echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)

188

189

190

 %.qo: %.qs

191

-	$(COMPILE.qc) -c -o $@ $<

192

+	@QPHOME@/src/qa -i $< -o $@

193

194

diff -ur qp8.5.orig/prolog/qp/Makefile.in qp8.5/prolog/qp/Makefile.in

195

--- qp8.5.orig/prolog/qp/Makefile.in	2008-06-17 10:17:26.000000000 +1200

196

+++ qp8.5/prolog/qp/Makefile.in	2008-06-28 14:16:55.000000000 +1200

197

@@ -3,6 +3,7 @@

198

#

199

 PROGRAM		= @QPHOME@/bin/qp

200

201

+SAVEFILE	= qp.qx

202

 SOURCES		= qp.ql

203

204

 BASES		= $(basename $(SOURCES))

205

@@ -13,9 +14,13 @@

206

 all: $(PROGRAM)

207

208

 $(PROGRAM): $(OBJECTS)

209

-	$(COMPILE.qc) -o $(PROGRAM) $(OBJECTS)

210

+	@QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)

211

+	@echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)

212

+	@echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)

213

+	@echo "export QPPATH QPLIBPATH" >>$(PROGRAM)

214

+	@echo -e "exec qem -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)

215

216

217

 %.qo: %.qs

218

-	$(COMPILE.qc) -c -o $@ $<

219

+	@QPHOME@/src/qa -i $< -o $@

220

221

diff -ur qp8.5.orig/src/Makefile.in qp8.5/src/Makefile.in

222

--- qp8.5.orig/src/Makefile.in	2008-06-17 10:17:26.000000000 +1200

223

+++ qp8.5/src/Makefile.in	2008-06-28 14:16:55.000000000 +1200

224

@@ -39,7 +39,7 @@

225

226

 #export DEBUGGING=

227

228

-export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized

229

+#export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized

230

 export QACXXFLAGS = -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized

231

232

 .PHONY: all

233

@@ -78,6 +78,9 @@

234

235

 # Targets

236

237

+.cc.o:

238

+	$(CXX) $(CXXFLAGS) @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized -c $<

239

+

240

 .PHONY: commands

241

 commands: $(GENERATED) $(LIBRARIES) $(BIG_LIBRARY)

242

 	@$(MAKE) $(ALL_COMMANDS)

1.1                  dev-lang/qu-prolog/files/qu-prolog-8.5-gcc4.3.patch

247

248

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.5-gcc4.3.patch?rev=1.1&view=markup

249

plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.5-gcc4.3.patch?rev=1.1&content-type=text/plain

250

251

Index: qu-prolog-8.5-gcc4.3.patch

252

===================================================================

253

diff -u qp8.5.orig/src/pedro_env.cc qp8.5/src/pedro_env.cc

254

--- qp8.5.orig/src/pedro_env.cc	2008-06-17 10:16:59.000000000 +1200

255

+++ qp8.5/src/pedro_env.cc	2008-07-02 18:55:38.000000000 +1200

256

@@ -1,4 +1,4 @@

257

-

258

+#include <algorithm>

259

 #include <string>

260

 #include <sstream>

261

 #include <stdio.h>

262

diff -u qp8.5.orig/src/system_support.cc qp8.5/src/system_support.cc

263

--- qp8.5.orig/src/system_support.cc	2008-06-17 10:16:59.000000000 +1200

264

+++ qp8.5/src/system_support.cc	2008-07-02 18:56:42.000000000 +1200

265

@@ -60,6 +60,7 @@

266

267

 // PORT

268

 #include "system_support.h"

269

+#include <cstdlib>

270

 #include <iostream>

271

 using namespace std;

--

277

gentoo-commits@l.g.o mailing list

1	keri 08/07/02 07:24:26
2
3	Added: qu-prolog-8.5-portage.patch
4	qu-prolog-8.5-gcc4.3.patch
5	Log:
6	Version bump.
7	(Portage version: 2.1.5.5)
8
9	Revision Changes Path
10	1.1 dev-lang/qu-prolog/files/qu-prolog-8.5-portage.patch
11
12	file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.5-portage.patch?rev=1.1&view=markup
13	plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.5-portage.patch?rev=1.1&content-type=text/plain
14
15	Index: qu-prolog-8.5-portage.patch
16	===================================================================
17	diff -ur qp8.5.orig/Makefile.in qp8.5/Makefile.in
18	--- qp8.5.orig/Makefile.in 2008-06-17 10:17:22.000000000 +1200
19	+++ qp8.5/Makefile.in 2008-06-28 14:16:55.000000000 +1200
20	@@ -14,6 +14,7 @@
21	# objects.
22	#
23
24	+export QPHOME = @prefix@/lib/qu-prolog
25	export QPBIN = @QPHOME@/bin
26
27
28	diff -ur qp8.5.orig/bin/qc.in qp8.5/bin/qc.in
29	--- qp8.5.orig/bin/qc.in 2007-08-01 12:23:42.000000000 +1200
30	+++ qp8.5/bin/qc.in 2008-06-28 14:16:55.000000000 +1200
31	@@ -47,24 +47,25 @@
32	#
33	# location of Qu-Prolog project
34	#
35	-PATH=@QPHOME@/bin:$PATH
36	+QPHOME=@libdir@/qu-prolog
37	+PATH=$QPHOME/bin:$PATH
38
39	#
40	# names of Qu-Prolog binaries
41	#
42	-preprocess=@QPHOME@/bin/qppp
43	-expand=@QPHOME@/bin/qg
44	-compile=@QPHOME@/bin/qc1
45	+preprocess=qppp
46	+expand=qg
47	+compile=qc1
48	compversion=qup
49	-assemble=@QPHOME@/bin/qa
50	-link=@QPHOME@/bin/ql
51	-execute=@QPHOME@/bin/qem
52	+assemble=qa
53	+link=ql
54	+execute=qem
55
56	#
57	# Use the line below when dynamic search for libraries is implemented.
58	#
59	# libqofiles=""
60	-libqofiles="@QPHOME@/prolog/compiler/.qo @QPHOME@/prolog/library/.qo"
61	+libqofiles="@QPHOME@/compiler/.qo @QPHOME@/library/.qo"
62
63	qlfiles=""
64	qlefiles=""
65	@@ -327,18 +328,7 @@
66	absexecfile=$execfile
67	;;
68	*)
69	- currdir=`pwd`
70	- case $currdir in
71	- /u*)
72	- abspath=`echo $currdir \| sed "s,/u./$HOSTNAME/,/homes/,"`
73	- ;;
74	- /tmp_mnt/*)
75	- abspath=`echo $currdir \| sed 's,/tmp_mnt/homes/[^/]*/,/homes/,'`
76	- ;;
77	- *)
78	- abspath=$currdir
79	- ;;
80	- esac
81	+ abspath=`pwd`
82	absexecfile=$abspath/$execfile
83	;;
84	esac
85	@@ -354,5 +344,8 @@
86
87	# make executable file
88
89	-echo "exec $execute $Eoptions $lflag -Q '$savefile' \$* $*" >$execfile
90	+echo "QPPATH=@prefix@/bin:$QPHOME/bin" >$execfile
91	+echo "QPLIBPATH=$QPHOME/compiler:$QPHOME/library:"'$QPLIBPATH' >>$execfile
92	+echo "export QPPATH QPLIBPATH" >>$execfile
93	+echo "exec $execute $Eoptions $lflag -Q '$savefile' \$* $*" >>$execfile
94	chmod a+x $execfile
95	diff -ur qp8.5.orig/prolog/compiler/Makefile.in qp8.5/prolog/compiler/Makefile.in
96	--- qp8.5.orig/prolog/compiler/Makefile.in 2008-06-17 10:17:26.000000000 +1200
97	+++ qp8.5/prolog/compiler/Makefile.in 2008-06-28 14:16:55.000000000 +1200
98	@@ -29,5 +29,5 @@
99
100
101	%.qo: %.qs
102	- $(COMPILE.qc) -c -o $@ $<
103	+ @QPHOME@/src/qa -i $< -o $@
104
105	diff -ur qp8.5.orig/prolog/library/Makefile.in qp8.5/prolog/library/Makefile.in
106	--- qp8.5.orig/prolog/library/Makefile.in 2008-06-17 10:17:26.000000000 +1200
107	+++ qp8.5/prolog/library/Makefile.in 2008-06-28 14:16:55.000000000 +1200
108	@@ -99,4 +99,4 @@
109
110
111	%.qo: %.qs
112	- $(COMPILE.qc) -c -o $@ $<
113	+ @QPHOME@/src/qa -i $< -o $@
114	diff -ur qp8.5.orig/prolog/qc1/Makefile.in qp8.5/prolog/qc1/Makefile.in
115	--- qp8.5.orig/prolog/qc1/Makefile.in 2008-06-17 10:17:26.000000000 +1200
116	+++ qp8.5/prolog/qc1/Makefile.in 2008-06-28 14:16:55.000000000 +1200
117	@@ -3,6 +3,7 @@
118	#
119	PROGRAM = @QPHOME@/bin/qc1.qup
120
121	+SAVEFILE = qc1.qx
122	SOURCES = qc1.ql
123
124	BASES = $(basename $(SOURCES))
125	@@ -13,8 +14,12 @@
126	all: $(PROGRAM)
127
128	$(PROGRAM): $(OBJECTS)
129	- $(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS)
130	+ @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/.qo @QPHOME@/prolog/library/.qo $(OBJECTS)
131	+ @echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
132	+ @echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
133	+ @echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
134	+ @echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
135
136	%.qo: %.qs
137	- $(COMPILE.qc) -c -o $@ $<
138	+ @QPHOME@/src/qa -i $< -o $@
139
140	diff -ur qp8.5.orig/prolog/qecat/Makefile.in qp8.5/prolog/qecat/Makefile.in
141	--- qp8.5.orig/prolog/qecat/Makefile.in 2008-06-17 10:17:26.000000000 +1200
142	+++ qp8.5/prolog/qecat/Makefile.in 2008-06-28 14:16:55.000000000 +1200
143	@@ -4,6 +4,7 @@
144
145	PROGRAM = $(QPBIN)/qecat
146
147	+SAVEFILE = qecat.qx
148	SOURCES = qecat.ql
149
150	BASES = $(basename $(SOURCES))
151	@@ -14,9 +15,13 @@
152	all: $(PROGRAM)
153
154	$(PROGRAM): $(OBJECTS)
155	- $(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS)
156	+ @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/.qo @QPHOME@/prolog/library/.qo $(OBJECTS)
157	+ @echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
158	+ @echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
159	+ @echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
160	+ @echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
161
162
163	%.qo: %.qs
164	- $(COMPILE.qc) -c -o $@ $<
165	+ @QPHOME@/src/qa -i $< -o $@
166
167	diff -ur qp8.5.orig/prolog/qg/Makefile.in qp8.5/prolog/qg/Makefile.in
168	--- qp8.5.orig/prolog/qg/Makefile.in 2008-06-17 10:17:26.000000000 +1200
169	+++ qp8.5/prolog/qg/Makefile.in 2008-06-28 14:16:55.000000000 +1200
170	@@ -4,6 +4,7 @@
171
172	PROGRAM = @QPHOME@/bin/qg
173
174	+SAVEFILE = qg.qx
175	SOURCES = qg.ql
176
177	BASES = $(basename $(SOURCES))
178	@@ -14,9 +15,13 @@
179	all: $(PROGRAM)
180
181	$(PROGRAM): $(OBJECTS)
182	- $(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS)
183	+ @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/.qo @QPHOME@/prolog/library/.qo $(OBJECTS)
184	+ @echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
185	+ @echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
186	+ @echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
187	+ @echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
188
189
190	%.qo: %.qs
191	- $(COMPILE.qc) -c -o $@ $<
192	+ @QPHOME@/src/qa -i $< -o $@
193
194	diff -ur qp8.5.orig/prolog/qp/Makefile.in qp8.5/prolog/qp/Makefile.in
195	--- qp8.5.orig/prolog/qp/Makefile.in 2008-06-17 10:17:26.000000000 +1200
196	+++ qp8.5/prolog/qp/Makefile.in 2008-06-28 14:16:55.000000000 +1200
197	@@ -3,6 +3,7 @@
198	#
199	PROGRAM = @QPHOME@/bin/qp
200
201	+SAVEFILE = qp.qx
202	SOURCES = qp.ql
203
204	BASES = $(basename $(SOURCES))
205	@@ -13,9 +14,13 @@
206	all: $(PROGRAM)
207
208	$(PROGRAM): $(OBJECTS)
209	- $(COMPILE.qc) -o $(PROGRAM) $(OBJECTS)
210	+ @QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/.qo @QPHOME@/prolog/library/.qo $(OBJECTS)
211	+ @echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
212	+ @echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
213	+ @echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
214	+ @echo -e "exec qem -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
215
216
217	%.qo: %.qs
218	- $(COMPILE.qc) -c -o $@ $<
219	+ @QPHOME@/src/qa -i $< -o $@
220
221	diff -ur qp8.5.orig/src/Makefile.in qp8.5/src/Makefile.in
222	--- qp8.5.orig/src/Makefile.in 2008-06-17 10:17:26.000000000 +1200
223	+++ qp8.5/src/Makefile.in 2008-06-28 14:16:55.000000000 +1200
224	@@ -39,7 +39,7 @@
225
226	#export DEBUGGING=
227
228	-export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
229	+#export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
230	export QACXXFLAGS = -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
231
232	.PHONY: all
233	@@ -78,6 +78,9 @@
234
235	# Targets
236
237	+.cc.o:
238	+ $(CXX) $(CXXFLAGS) @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized -c $<
239	+
240	.PHONY: commands
241	commands: $(GENERATED) $(LIBRARIES) $(BIG_LIBRARY)
242	@$(MAKE) $(ALL_COMMANDS)
243
244
245
246	1.1 dev-lang/qu-prolog/files/qu-prolog-8.5-gcc4.3.patch
247
248	file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.5-gcc4.3.patch?rev=1.1&view=markup
249	plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/qu-prolog/files/qu-prolog-8.5-gcc4.3.patch?rev=1.1&content-type=text/plain
250
251	Index: qu-prolog-8.5-gcc4.3.patch
252	===================================================================
253	diff -u qp8.5.orig/src/pedro_env.cc qp8.5/src/pedro_env.cc
254	--- qp8.5.orig/src/pedro_env.cc 2008-06-17 10:16:59.000000000 +1200
255	+++ qp8.5/src/pedro_env.cc 2008-07-02 18:55:38.000000000 +1200
256	@@ -1,4 +1,4 @@
257	-
258	+#include <algorithm>
259	#include <string>
260	#include <sstream>
261	#include <stdio.h>
262	diff -u qp8.5.orig/src/system_support.cc qp8.5/src/system_support.cc
263	--- qp8.5.orig/src/system_support.cc 2008-06-17 10:16:59.000000000 +1200
264	+++ qp8.5/src/system_support.cc 2008-07-02 18:56:42.000000000 +1200
265	@@ -60,6 +60,7 @@
266
267	// PORT
268	#include "system_support.h"
269	+#include <cstdlib>
270	#include <iostream>
271	using namespace std;
272
273
274
275
276	--
277	gentoo-commits@l.g.o mailing list

Gentoo Archives: gentoo-commits