1
#! /bin/sh /usr/share/dpatch/dpatch-run
2
## 05_unit_libc.dpatch by <Torsten Werner <twerner@debian.org>>
4
## All lines beginning with `## DP:' are a description of the patch.
8
diff -urNad fpc-2.0.4~/packages/base/Makefile fpc-2.0.4/packages/base/Makefile
9
--- fpc-2.0.4~/packages/base/Makefile 2007-01-14 00:54:35.000000000 +0100
10
+++ fpc-2.0.4/packages/base/Makefile 2007-01-27 23:11:01.000000000 +0100
13
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/06/12]
14
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/09/09]
17
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
18
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
19
BSDs = freebsd netbsd openbsd darwin
20
UNIXs = linux $(BSDs) solaris qnx
21
LIMIT83fs = go32v2 os2 emx watcom
23
ifeq ($(FULL_TARGET),i386-wdosx)
24
override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb
26
-ifeq ($(FULL_TARGET),i386-darwin)
27
-override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb libasync mysql ibase postgres oracle odbc sqlite pthreads imagemagick
29
ifeq ($(FULL_TARGET),i386-emx)
30
override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb
33
ifeq ($(FULL_TARGET),i386-netwlibc)
34
override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb
36
-ifeq ($(FULL_TARGET),i386-wince)
37
-override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb ibase sqlite postgres
39
ifeq ($(FULL_TARGET),m68k-linux)
40
-override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb gdbint libasync mysql ibase postgres oracle odbc pthreads sqlite graph imagemagick
41
+override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb gdbint libasync mysql ibase postgres oracle odbc pthreads sqlite graph imagemagick libc
43
ifeq ($(FULL_TARGET),m68k-freebsd)
44
override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb gdbint libasync graph mysql ibase postgres oracle odbc sqlite pthreads imagemagick
46
override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb
48
ifeq ($(FULL_TARGET),powerpc-linux)
49
-override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb gdbint libasync mysql ibase postgres oracle odbc pthreads sqlite graph imagemagick
50
+override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb gdbint libasync mysql ibase postgres oracle odbc pthreads sqlite graph imagemagick libc
52
ifeq ($(FULL_TARGET),powerpc-netbsd)
53
override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb gdbint libasync mysql ibase postgres oracle odbc imagemagick
55
override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb
57
ifeq ($(FULL_TARGET),sparc-linux)
58
-override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb gdbint libasync mysql ibase postgres oracle odbc pthreads sqlite graph imagemagick
59
+override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb gdbint libasync mysql ibase postgres oracle odbc pthreads sqlite graph imagemagick libc
61
ifeq ($(FULL_TARGET),sparc-netbsd)
62
override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb gdbint libasync mysql ibase postgres oracle odbc imagemagick
64
ifeq ($(FULL_TARGET),x86_64-freebsd)
65
override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb gdbint libasync graph mysql ibase postgres oracle odbc sqlite pthreads imagemagick
67
-ifeq ($(FULL_TARGET),x86_64-win64)
68
-override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb
70
ifeq ($(FULL_TARGET),arm-linux)
71
-override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb gdbint libasync mysql ibase postgres oracle odbc pthreads sqlite graph imagemagick
73
-ifeq ($(FULL_TARGET),arm-palmos)
74
-override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb
76
-ifeq ($(FULL_TARGET),arm-wince)
77
-override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb ibase sqlite postgres
79
-ifeq ($(FULL_TARGET),arm-gba)
80
-override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb
82
-ifeq ($(FULL_TARGET),powerpc64-linux)
83
-override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb gdbint libasync mysql ibase postgres oracle odbc pthreads sqlite graph imagemagick
84
+override TARGET_DIRS+=hash paszlib pasjpeg regexpr netdb gdbint libasync mysql ibase postgres oracle odbc pthreads sqlite graph imagemagick libc
86
override INSTALL_FPCPACKAGE=y
87
override INSTALL_FPCSUBDIR=packages/base
89
ifndef INSTALL_DATADIR
90
INSTALL_DATADIR=$(INSTALL_BASEDIR)
92
-ifndef INSTALL_SHAREDDIR
93
-INSTALL_SHAREDDIR=$(INSTALL_PREFIX)/lib
97
CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))
102
-SHAREDLIBPREFIX=libfp
104
-IMPORTLIBPREFIX=libimp
106
ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
107
ifeq ($(OS_TARGET),go32v1)
112
-ifeq ($(OS_TARGET),gba)
118
ifeq ($(OS_TARGET),go32v1)
120
@@ -998,17 +967,12 @@
124
-TARPROG:=$(strip $(wildcard $(addsuffix /gtar$(SRCEXEEXT),$(SEARCHPATH))))
126
TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH))))
128
TARPROG= __missing_command_TARPROG
130
TARPROG:=$(firstword $(TARPROG))
133
-TARPROG:=$(firstword $(TARPROG))
137
ASNAME=$(BINUTILSPREFIX)as
138
@@ -1101,9 +1065,6 @@
139
ifneq ($(OS_TARGET),$(OS_SOURCE))
140
override FPCOPT+=-T$(OS_TARGET)
142
-ifneq ($(CPU_TARGET),$(CPU_SOURCE))
143
-override FPCOPT+=-P$(CPU_TARGET)
145
ifeq ($(OS_SOURCE),openbsd)
146
override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
148
@@ -1138,24 +1099,25 @@
149
override FPCOPTDEF+=DEBUG
152
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
153
ifeq ($(CPU_TARGET),i386)
157
ifeq ($(CPU_TARGET),powerpc)
165
-override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
167
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
168
override FPCOPTDEF+=RELEASE
174
-override FPCOPT+=-O2
175
+ifeq ($(CPU_TARGET),i386)
176
+override FPCOPT+=-OG2p3
180
override FPCOPT+=-vwni
181
@@ -1199,13 +1161,10 @@
182
override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
186
-override FPCOPT+=-Cg
187
-ifeq ($(CPU_TARGET),i386)
188
-override FPCOPT+=-Aas
190
+ifeq ($(OS_TARGET),linux)
191
+ifeq ($(FPC_VERSION),1.0.6)
192
+override FPCOPTDEF+=HASUNIX
197
override FPCOPT+=$(OPT)
198
@@ -1221,14 +1180,6 @@
199
override FPCOPT:=!FPCEXTCMD
202
-override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
203
-override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
204
-ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))
205
-override ACROSSCOMPILE=1
208
-override FPCOPT+=$(CROSSOPT)
210
override COMPILER:=$(FPC) $(FPCOPT)
211
ifeq (,$(findstring -s ,$(COMPILER)))
213
@@ -1249,7 +1200,7 @@
214
override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
217
-override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
218
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
220
override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
222
@@ -1557,22 +1508,6 @@
223
TARGET_DIRS_REGEXPR=1
226
-ifeq ($(FULL_TARGET),i386-darwin)
228
-TARGET_DIRS_PASZLIB=1
229
-TARGET_DIRS_PASJPEG=1
230
-TARGET_DIRS_REGEXPR=1
232
-TARGET_DIRS_LIBASYNC=1
235
-TARGET_DIRS_POSTGRES=1
236
-TARGET_DIRS_ORACLE=1
238
-TARGET_DIRS_SQLITE=1
239
-TARGET_DIRS_PTHREADS=1
240
-TARGET_DIRS_IMAGEMAGICK=1
242
ifeq ($(FULL_TARGET),i386-emx)
244
TARGET_DIRS_PASZLIB=1
245
@@ -1594,16 +1529,6 @@
246
TARGET_DIRS_REGEXPR=1
249
-ifeq ($(FULL_TARGET),i386-wince)
251
-TARGET_DIRS_PASZLIB=1
252
-TARGET_DIRS_PASJPEG=1
253
-TARGET_DIRS_REGEXPR=1
256
-TARGET_DIRS_SQLITE=1
257
-TARGET_DIRS_POSTGRES=1
259
ifeq ($(FULL_TARGET),m68k-linux)
261
TARGET_DIRS_PASZLIB=1
262
@@ -1621,6 +1546,7 @@
265
TARGET_DIRS_IMAGEMAGICK=1
268
ifeq ($(FULL_TARGET),m68k-freebsd)
270
@@ -1708,6 +1634,7 @@
273
TARGET_DIRS_IMAGEMAGICK=1
276
ifeq ($(FULL_TARGET),powerpc-netbsd)
278
@@ -1771,6 +1698,7 @@
281
TARGET_DIRS_IMAGEMAGICK=1
284
ifeq ($(FULL_TARGET),sparc-netbsd)
286
@@ -1840,13 +1768,6 @@
287
TARGET_DIRS_PTHREADS=1
288
TARGET_DIRS_IMAGEMAGICK=1
290
-ifeq ($(FULL_TARGET),x86_64-win64)
292
-TARGET_DIRS_PASZLIB=1
293
-TARGET_DIRS_PASJPEG=1
294
-TARGET_DIRS_REGEXPR=1
297
ifeq ($(FULL_TARGET),arm-linux)
299
TARGET_DIRS_PASZLIB=1
300
@@ -1864,48 +1785,7 @@
303
TARGET_DIRS_IMAGEMAGICK=1
305
-ifeq ($(FULL_TARGET),arm-palmos)
307
-TARGET_DIRS_PASZLIB=1
308
-TARGET_DIRS_PASJPEG=1
309
-TARGET_DIRS_REGEXPR=1
312
-ifeq ($(FULL_TARGET),arm-wince)
314
-TARGET_DIRS_PASZLIB=1
315
-TARGET_DIRS_PASJPEG=1
316
-TARGET_DIRS_REGEXPR=1
319
-TARGET_DIRS_SQLITE=1
320
-TARGET_DIRS_POSTGRES=1
322
-ifeq ($(FULL_TARGET),arm-gba)
324
-TARGET_DIRS_PASZLIB=1
325
-TARGET_DIRS_PASJPEG=1
326
-TARGET_DIRS_REGEXPR=1
329
-ifeq ($(FULL_TARGET),powerpc64-linux)
331
-TARGET_DIRS_PASZLIB=1
332
-TARGET_DIRS_PASJPEG=1
333
-TARGET_DIRS_REGEXPR=1
335
-TARGET_DIRS_GDBINT=1
336
-TARGET_DIRS_LIBASYNC=1
339
-TARGET_DIRS_POSTGRES=1
340
-TARGET_DIRS_ORACLE=1
342
-TARGET_DIRS_PTHREADS=1
343
-TARGET_DIRS_SQLITE=1
345
-TARGET_DIRS_IMAGEMAGICK=1
348
ifdef TARGET_DIRS_HASH
350
diff -urNad fpc-2.0.4~/packages/base/Makefile.fpc fpc-2.0.4/packages/base/Makefile.fpc
351
--- fpc-2.0.4~/packages/base/Makefile.fpc 2007-01-14 00:54:35.000000000 +0100
352
+++ fpc-2.0.4/packages/base/Makefile.fpc 2007-01-27 23:10:30.000000000 +0100
356
dirs=hash paszlib pasjpeg regexpr netdb
357
-dirs_i386_linux=libc
358
-dirs_x86_64_linux=libc
359
dirs_linux=gdbint libasync mysql ibase postgres oracle odbc \
360
- pthreads sqlite graph imagemagick
361
+ pthreads sqlite graph imagemagick libc
362
dirs_win32=gdbint mysql ibase odbc sqlite postgres oracle graph imagemagick
363
dirs_wince=ibase sqlite postgres
364
dirs_go32v2=gdbint graph