>
> fpc trunk 26427 compiles here under Linux 64bit with fpc 2.6.2.
>
> Mattias
Hi Mattias
Even though it currently works, I believe at least Makefile.fpc in rtl/linux
directory is not updated.
It still assumes varutils.pp, variants.pp in old places.
You can try to look at my roughly made patch attached.
Please fix.
--
Regards,
Denis Golovan
diff --git a/rtl/linux/Makefile.fpc b/rtl/linux/Makefile.fpc
index 23ca2b6..8586d78 100644
--- a/rtl/linux/Makefile.fpc
+++ b/rtl/linux/Makefile.fpc
@@ -16,7 +16,7 @@ units=$(SYSTEMUNIT) fpintres $(SYSINIT_UNITS) \
charset cpall buildcollations character unixcp getopts \
errors ipc serial terminfo dl dynlibs \
types sysconst fpwidestring \
- cthreads classes fgl strutils rtlconsts dos cwstring fpcylix clocale
+ cthreads classes variants fgl strutils rtlconsts dos cwstring fpcylix clocale
implicitunits=exeinfo \
cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \
cp437 cp646 cp850 cp856 cp866 cp874 cp932 cp936 cp949 cp950 cp8859_1 cp8859_5 \
@@ -40,8 +40,8 @@ fpcdir=../..
target=linux
[compiler]
-includedir=$(INC) $(PROCINC) $(UNIXINC) $(ARCH)
-sourcedir=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) $(COMMON)
+includedir=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) $(VARINC)
+sourcedir=$(INC) $(PROCINC) $(UNIXINC) $(VARINC) $(ARCH) $(COMMON)
targetdir=.
[shared]
@@ -58,6 +58,8 @@ INC=$(RTL)/inc
COMMON=$(RTL)/common
PROCINC=$(RTL)/$(ARCH)
UNIXINC=$(RTL)/unix
+VARINC=../../packages/rtl-objpas/src/inc
+RTLOBJPAS=../../packages/rtl-objpas/src/unix
UNITPREFIX=rtl
@@ -288,7 +290,7 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in
$(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp
classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
- sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) fgl$(PPUEXT)
+ variants$(PPUEXT) sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) fgl$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp
typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) sysutils$(PPUEXT) rtlconsts$(PPUEXT)
@@ -304,12 +306,12 @@ math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT)
gettext$(PPUEXT): $(OBJPASDIR)/gettext.pp objpas$(PPUEXT) sysutils$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/gettext.pp
-varutils$(PPUEXT) : $(OBJPASDIR)/cvarutil.inc $(OBJPASDIR)/varutils.inc \
- $(OBJPASDIR)/varutilh.inc $(UNIXINC)/varutils.pp sysutils$(PPUEXT)
- $(COMPILER) -I$(OBJPASDIR) $(UNIXINC)/varutils.pp
+varutils$(PPUEXT) : $(VARINC)/cvarutil.inc $(VARINC)/varutils.inc \
+ $(VARINC)/varutilh.inc $(UNIXINC)/varutils.pp sysutils$(PPUEXT)
+ $(COMPILER) -I$(OBJPASDIR) -I$(VARINC) $(RTLOBJPAS)/varutils.pp
-variants$(PPUEXT) : $(INC)/variants.pp sysutils$(PPUEXT) sysconst$(PPUEXT) varutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT)
- $(COMPILER) -Fi$(INC) $(INC)/variants.pp
+variants$(PPUEXT) : $(VARINC)/variants.pp sysutils$(PPUEXT) sysconst$(PPUEXT) varutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT)
+ $(COMPILER) -Fi$(INC) $(VARINC)/variants.pp
fmtbcd$(PPUEXT) : $(OBJPASDIR)/fmtbcd.pp objpas$(PPUEXT) sysutils$(PPUEXT) variants$(PPUEXT) classes$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/fmtbcd.pp
_______________________________________________
fpc-pascal maillist - fpc-pascal@lists.freepascal.org
http://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-pascal
