From efa80632ed8c2a4a07f38d877c10560d025e1707 Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Thu, 10 Apr 2014 09:50:59 +0000
Subject: [PATCH]  Remove varutils, variants and dateutils units which are now
 in rtl-objpas package

git-svn-id: trunk@27505 -
---
 rtl/nativent/Makefile     | 164 ++++++++++++++++++++------------------
 rtl/nativent/Makefile.fpc |   6 +-
 2 files changed, 88 insertions(+), 82 deletions(-)

diff --git a/rtl/nativent/Makefile b/rtl/nativent/Makefile
index 7ce2ff0df6..3561cacd7b 100644
--- a/rtl/nativent/Makefile
+++ b/rtl/nativent/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-03-19 rev 27188]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-04-01 rev 27428]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos
@@ -801,229 +801,229 @@ ifeq ($(FULL_TARGET),i8086-msdos)
 override TARGET_IMPLICITUNITS+=ndk ndkutils ddk ctypes strings rtlconsts sysconst sysutils math types typinfo fgl classes $(CPU_UNITS) charset getopts cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-android)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-aix)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-netbsd)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-openbsd)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),arm-android)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc64-aix)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),mips-linux)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),mipsel-embedded)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),mipsel-android)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),jvm-java)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),jvm-android)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i8086-msdos)
-override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 override INSTALL_FPCPACKAGE=y
 ifeq ($(FULL_TARGET),i386-linux)
@@ -2257,17 +2257,23 @@ ifdef ACROSSCOMPILE
 override FPCOPT+=$(CROSSOPT)
 endif
 override COMPILER:=$(strip $(FPC) $(FPCOPT))
-ifeq (,$(findstring -s ,$(COMPILER)))
+ifneq (,$(findstring -sh ,$(COMPILER)))
+UseEXECPPAS=1
+endif
+ifneq (,$(findstring -s ,$(COMPILER)))
+ifeq ($(FULL_SOURCE),$(FULL_TARGET))
+UseEXECPPAS=1
+endif
+endif
+ifneq ($(UseEXECPPAS),1)
 EXECPPAS=
 else
-ifeq ($(FULL_SOURCE),$(FULL_TARGET))
 ifdef RUNBATCH
 EXECPPAS:=@$(RUNBATCH) $(PPAS)
 else
 EXECPPAS:=@$(PPAS)
 endif
 endif
-endif
 .PHONY: fpc_units
 ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
 override ALLTARGET+=fpc_units
diff --git a/rtl/nativent/Makefile.fpc b/rtl/nativent/Makefile.fpc
index bfbd4fd34e..b2ac965236 100644
--- a/rtl/nativent/Makefile.fpc
+++ b/rtl/nativent/Makefile.fpc
@@ -13,19 +13,19 @@ implicitunits=ndk ndkutils ddk \
       ctypes strings \
 #      heaptrc
 #      initc cmem dynlibs signals \
-#      dos crt objects \
+#      dos \
       rtlconsts sysconst sysutils math types \
       typinfo fgl classes \
       $(CPU_UNITS) charset getopts \
 #      sockets printer \
-#      video mouse keyboard
+#      keyboard
 #      sharemem exeinfo fpintres \
       cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \
       cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852
 
 # shared=$(DLLS)
 
-rsts=math varutils typinfo variants classes dateutils sysconst
+rsts=math typinfo classes sysconst
 
 [require]
 nortl=y