paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2026-02-04 07:54:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove OS rules for character unit and use CHARACTERUNIT variable

Browse Source
This commit is contained in:
Pierre Muller 2023-09-13 20:10:32 +00:00
parent 971ba981f7
commit 017c1abfac
10 changed files with 10 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rtl/aix/Makefile.fpc
View File

@ -13,7 +13,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $
termio unix initc $(CMEMUNIT) \
$(LNFOGDBUNIT) \
sysutils typinfo math $(SORTBASEUNIT) $(FGLUNIT) classes \
$(CHARSETUNIT) $(CPALLUNIT) character unixcp $(GETOPTSUNIT) \
$(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) unixcp $(GETOPTSUNIT) \
errors \
# ipc
dl dynlibs \
@ -167,11 +167,6 @@ classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc)
typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) rtlconsts$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp
# let it depend on buildcollations to prevent simultaneous building of unicodedata
character$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/character.pas $(OBJPASUNIT)$(PPUEXT) rtlconsts$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/character.pas
math$(PPUEXT): $(OBJPASDIR)/math.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/math.pp

5
rtl/android/Makefile.fpc
View File

@ -10,7 +10,7 @@ loaders=$(LOADERS)
units=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) \
$(UUCHARUNIT) unixtype ctypes baseunix $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil \
$(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix linux initc $(CMEMUNIT) \
linuxvcs sysutils typinfo math $(CHARSETUNIT) $(CPALLUNIT) character \
linuxvcs sysutils typinfo math $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) \
$(GETOPTSUNIT) errors dl dynlibs \
types sysconst cthreads $(SORTBASEUNIT) classes $(FGLUNIT) \
rtlconsts dos cwstring fpcylix unixcp fpwidestring \
@ -193,9 +193,6 @@ classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc)
typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) rtlconsts$(PPUEXT)
$(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp
character$(PPUEXT): $(OBJPASDIR)/character.pas $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) rtlconsts$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/character.pas
math$(PPUEXT): $(OBJPASDIR)/math.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/math.pp

6
rtl/dragonfly/Makefile.fpc
View File

@ -11,7 +11,7 @@ fpcpackage=y
[target]
loaders=prt0 cprt0 gprt0 dllprt0
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \
$(STRINGSUNIT) syscall sysctl baseunix unixutil character \
$(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) \
unix rtlconsts initc $(CMEMUNIT) \
dl termio \
sysutils math typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs \
@ -185,10 +185,6 @@ types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) math$(PPUEXT) $(SY
sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/sysconst.pp
# let it depend on buildcollations to prevent simultaneous building of unicodedata
character$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/character.pas $(OBJPASUNIT)$(PPUEXT) rtlconsts$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/character.pas
#
# Other system-independent RTL Units
#

6
rtl/freebsd/Makefile.fpc
View File

@ -11,7 +11,7 @@ fpcpackage=y
[target]
loaders=prt0 cprt0 gprt0 dllprt0
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \
$(STRINGSUNIT) syscall sysctl baseunix unixutil character \
$(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) \
unix rtlconsts initc $(CMEMUNIT) \
dl termio \
sysutils math typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs \
@ -196,10 +196,6 @@ types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) math$(PPUEXT) $(SY
sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/sysconst.pp
# let it depend on buildcollations to prevent simultaneous building of unicodedata
character$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/character.pas $(OBJPASUNIT)$(PPUEXT) rtlconsts$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/character.pas
#
# Other system-independent RTL Units
#

5
rtl/go32v2/Makefile.fpc
View File

@ -11,7 +11,7 @@ units=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUN
sysutils classes math typinfo \
cpu mmx $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) ctypes $(FGLUNIT) \
msmouse $(CHARSETUNIT) $(CPALLUNIT) \
character fpwidestring unicodedata \
$(CHARACTERUNIT) fpwidestring unicodedata \
types sysconst rtlconst \
$(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
rsts=math typinfo classes sysconst
@ -176,9 +176,6 @@ ucomplex$(PPUEXT) : $(INC)/ucomplex.pp math$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(INC)/ucomplex.pp
$(EXECPPAS)
character$(PPUEXT): $(OBJPASDIR)/character.pas sysutils$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) rtlconst$(PPUEXT) unicodedata$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/character.pas
#
# Other system-dependent RTL Units
#

5
rtl/msxdos/Makefile.fpc
View File

@ -12,7 +12,7 @@ units=system si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(STRINGSUNIT) $(
# $(GETOPTSUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes \
# msmouse ports \
# $(CHARSETUNIT) $(CPALLUNIT) ctypes \
# fpwidestring character unicodedata
# fpwidestring $(CHARACTERUNIT) unicodedata
# $(CMEMUNIT)
# initc profile dxetype dxeload emu387 \
# cpu mmx \
@ -138,9 +138,6 @@ cpu$(PPUEXT) : $(PROCINC)/cpu.pp sysutils$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
$(EXECPPAS)
character$(PPUEXT): $(OBJPASDIR)/character.pas sysutils$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) rtlconsts$(PPUEXT) unicodedata$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/character.pas
#
# Other system-dependent RTL Units
#

6
rtl/netbsd/Makefile.fpc
View File

@ -11,7 +11,7 @@ fpcpackage=y
[target]
loaders=prt0 cprt0 dllprt0
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \
$(STRINGSUNIT) syscall sysctl baseunix unixutil character \
$(STRINGSUNIT) syscall sysctl baseunix unixutil $(CHARACTERUNIT) \
unix rtlconsts initc $(CMEMUNIT) \
dl termio \
sysutils math typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) dynlibs \
@ -197,10 +197,6 @@ math$(PPUEXT): $(OBJPASDIR)/math.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT)
types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) math$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/types.pp
# let it depend on buildcollations to prevent simultaneous building of unicodedata
character$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/character.pas $(OBJPASUNIT)$(PPUEXT) rtlconsts$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/character.pas
#
# Other system-independent RTL Units
#

6
rtl/openbsd/Makefile.fpc
View File

@ -14,7 +14,7 @@ units=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASU
$(LINUXUNIT) unixtype unixutil unix ctypes bsd \
$(CPU_UNITS) dos rtlconsts \
sysutils $(SORTBASEUNIT) $(FGLUNIT) classes typinfo math \
$(CHARSETUNIT) $(CPALLUNIT) character $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \
$(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \
errors \
types sysctl sysconst \
$(FPINTRESUNIT) dynlibs cwstring $(CMEMUNIT) dl termio \
@ -221,10 +221,6 @@ dynlibs$(PPUEXT) : $(INC)/dynlibs.pas $(UNIXINC)/dynlibs.inc dl$(PPUEXT) $(OBJPA
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) dynlibs$(PPUEXT)
$(COMPILER) $<
# let it depend on buildcollations to prevent simultaneous building of unicodedata
character$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/character.pas $(OBJPASUNIT)$(PPUEXT) rtlconsts$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/character.pas
#
# Other system-independent RTL Units
#

6
rtl/solaris/Makefile.fpc
View File

@ -15,7 +15,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $
$(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) \
errors \
dl dynlibs \
types sysconst character \
types sysconst $(CHARACTERUNIT) \
rtlconsts cthreads \
dos fpwidestring \
cwstring $(FPINTRESUNIT) $(CPU_UNITS) \
@ -180,10 +180,6 @@ sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT
rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/rtlconsts.pp
# let it depend on buildcollations to prevent simultaneous building of unicodedata
character$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/character.pas $(OBJPASUNIT)$(PPUEXT) rtlconsts$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/character.pas
#
# Other system-independent RTL Units
#

5
rtl/win16/Makefile.fpc
View File

@ -9,7 +9,7 @@ units=system $(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(ISO7185UNIT) $(EXTPASU
wintypes winprocs win31 ports dynlibs $(SORTBASEUNIT) \
sysconst rtlconsts sysutils math types typinfo $(FGLUNIT) \
classes $(CHARSETUNIT) cpu $(GETOPTSUNIT) $(CPALLUNIT) \
unicodedata character ctypes
unicodedata $(CHARACTERUNIT) ctypes
implicitunits=\
cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \
cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 \
@ -167,9 +167,6 @@ cpu$(PPUEXT) : $(PROCINC)/cpu.pp sysutils$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
$(EXECPPAS)
character$(PPUEXT): $(OBJPASDIR)/character.pas sysutils$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) rtlconsts$(PPUEXT) unicodedata$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/character.pas
#
# Other system-dependent RTL Units
#