Browse Source

Disable libraries not compiling for jvm-java or jvm-android targets

git-svn-id: trunk@39808 -
pierre 6 years ago
parent
commit
41d2a0a496
59 changed files with 139 additions and 0 deletions
  1. 2 0
      packages/bzip2/fpmake.pp
  2. 2 0
      packages/chm/fpmake.pp
  3. 4 0
      packages/dblib/fpmake.pp
  4. 2 0
      packages/fcl-async/fpmake.pp
  5. 2 0
      packages/fcl-base/fpmake.pp
  6. 2 0
      packages/fcl-db/fpmake.pp
  7. 3 0
      packages/fcl-extra/fpmake.pp
  8. 2 0
      packages/fcl-fpcunit/fpmake.pp
  9. 2 0
      packages/fcl-image/fpmake.pp
  10. 2 0
      packages/fcl-js/fpmake.pp
  11. 2 0
      packages/fcl-json/fpmake.pp
  12. 2 0
      packages/fcl-net/fpmake.pp
  13. 2 0
      packages/fcl-passrc/fpmake.pp
  14. 3 0
      packages/fcl-pdf/fpmake.pp
  15. 2 0
      packages/fcl-process/fpmake.pp
  16. 2 0
      packages/fcl-registry/fpmake.pp
  17. 2 0
      packages/fcl-res/fpmake.pp
  18. 2 0
      packages/fcl-sdo/fpmake.pp
  19. 2 0
      packages/fcl-sound/fpmake.pp
  20. 2 0
      packages/fcl-stl/fpmake.pp
  21. 2 0
      packages/fcl-xml/fpmake.pp
  22. 2 0
      packages/fftw/fpmake.pp
  23. 2 0
      packages/fpmkunit/fpmake.pp
  24. 2 0
      packages/fppkg/fpmake.pp
  25. 2 0
      packages/gdbm/fpmake.pp
  26. 3 0
      packages/hash/fpmake.pp
  27. 2 0
      packages/hermes/fpmake.pp
  28. 3 0
      packages/httpd22/fpmake.pp
  29. 2 0
      packages/httpd24/fpmake.pp
  30. 2 0
      packages/ibase/fpmake.pp
  31. 2 0
      packages/imagemagick/fpmake.pp
  32. 3 0
      packages/libenet/fpmake.pp
  33. 2 0
      packages/libgd/fpmake.pp
  34. 3 0
      packages/libmicrohttpd/fpmake.pp
  35. 2 0
      packages/libpng/fpmake.pp
  36. 2 0
      packages/libtar/fpmake.pp
  37. 2 0
      packages/mysql/fpmake.pp
  38. 2 0
      packages/numlib/fpmake.pp
  39. 3 0
      packages/odbc/fpmake.pp
  40. 3 0
      packages/openssl/fpmake.pp
  41. 2 0
      packages/oracle/fpmake.pp
  42. 2 0
      packages/pasjpeg/fpmake.pp
  43. 3 0
      packages/pastojs/fpmake.pp
  44. 2 0
      packages/paszlib/fpmake.pp
  45. 3 0
      packages/pcap/fpmake.pp
  46. 2 0
      packages/postgres/fpmake.pp
  47. 3 0
      packages/pthreads/fpmake.pp
  48. 3 0
      packages/regexpr/fpmake.pp
  49. 3 0
      packages/rtl-console/fpmake.pp
  50. 3 0
      packages/rtl-extra/fpmake.pp
  51. 3 0
      packages/rtl-generics/fpmake.pp
  52. 3 0
      packages/rtl-objpas/fpmake.pp
  53. 3 0
      packages/rtl-unicode/fpmake.pp
  54. 3 0
      packages/sqlite/fpmake.pp
  55. 2 0
      packages/symbolic/fpmake.pp
  56. 2 0
      packages/tcl/fpmake.pp
  57. 2 0
      packages/unzip/fpmake.pp
  58. 2 0
      packages/webidl/fpmake.pp
  59. 3 0
      packages/zlib/fpmake.pp

+ 2 - 0
packages/bzip2/fpmake.pp

@@ -29,6 +29,8 @@ begin
     P.Description := 'BZip2 decompression unit.';
     P.Description := 'BZip2 decompression unit.';
     P.NeedLibC:= true;
     P.NeedLibC:= true;
     P.OSes := P.OSes - [embedded,nativent,msdos,win16,macos,palmos];
     P.OSes := P.OSes - [embedded,nativent,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');

+ 2 - 0
packages/chm/fpmake.pp

@@ -26,6 +26,8 @@ begin
     P.Description := 'Standalone CHM reader and writer library';
     P.Description := 'Standalone CHM reader and writer library';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes := P.OSes - [embedded,nativent,msdos,win16,macos,palmos,atari];
     P.OSes := P.OSes - [embedded,nativent,msdos,win16,macos,palmos,atari];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     D:=P.Dependencies.Add('fcl-xml');
     D:=P.Dependencies.Add('fcl-xml');
     D:=P.Dependencies.Add('fcl-base');
     D:=P.Dependencies.Add('fcl-base');

+ 4 - 0
packages/dblib/fpmake.pp

@@ -30,6 +30,10 @@ begin
       P.SourcePath.Add('src');
       P.SourcePath.Add('src');
       P.IncludePath.Add('src');
       P.IncludePath.Add('src');
 
 
+      P.OSes := DBLibOSes;
+      if Defaults.CPU=jvm then
+        P.OSes := P.OSes - [android];
+
       T:=P.Targets.AddUnit('dblib.pp',DBLibOSes);
       T:=P.Targets.AddUnit('dblib.pp',DBLibOSes);
     end;
     end;
 end;
 end;

+ 2 - 0
packages/fcl-async/fpmake.pp

@@ -26,6 +26,8 @@ begin
     P.Description := 'Asynchronous event management of Free Component Libraries (FCL), FPC''s OOP library.';
     P.Description := 'Asynchronous event management of Free Component Libraries (FCL), FPC''s OOP library.';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes:=AllUnixOses;
     P.OSes:=AllUnixOses;
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.SourcePath.Add('src/unix',AllUnixOSes);
     P.SourcePath.Add('src/unix',AllUnixOSes);

+ 2 - 0
packages/fcl-base/fpmake.pp

@@ -28,6 +28,8 @@ begin
     P.Description := 'Base library of Free Component Libraries (FCL), FPC''s OOP library.';
     P.Description := 'Base library of Free Component Libraries (FCL), FPC''s OOP library.';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.SourcePath.Add('src/$(OS)');
     P.SourcePath.Add('src/$(OS)');

+ 2 - 0
packages/fcl-db/fpmake.pp

@@ -33,6 +33,8 @@ begin
     P.Description := 'Database library of Free Component Libraries(FCL), FPC''s OOP library.';
     P.Description := 'Database library of Free Component Libraries(FCL), FPC''s OOP library.';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.Directory:=ADirectory;
     P.Directory:=ADirectory;
     P.Version:='3.3.1';
     P.Version:='3.3.1';

+ 3 - 0
packages/fcl-extra/fpmake.pp

@@ -19,6 +19,9 @@ begin
     P.Version:='3.3.1';
     P.Version:='3.3.1';
     P.Dependencies.Add('fcl-base');
     P.Dependencies.Add('fcl-base');
     P.OSes:=[Win32,Win64]+AllUnixOSes;
     P.OSes:=[Win32,Win64]+AllUnixOSes;
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.Dependencies.Add('winunits-jedi',[Win32,Win64]);
     P.Dependencies.Add('winunits-jedi',[Win32,Win64]);
     P.Dependencies.Add('winunits-base',[Win32,Win64]);
     P.Dependencies.Add('winunits-base',[Win32,Win64]);
     P.Dependencies.Add('univint',[darwin,iPhoneSim]);
     P.Dependencies.Add('univint',[darwin,iPhoneSim]);

+ 2 - 0
packages/fcl-fpcunit/fpmake.pp

@@ -31,6 +31,8 @@ begin
     P.Description := 'Unit testing system inspired by JUnit of Free Component Libraries (FCL), FPC''s OOP library.';
     P.Description := 'Unit testing system inspired by JUnit of Free Component Libraries (FCL), FPC''s OOP library.';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes := P.OSes - [embedded,nativent,msdos,win16,macos,palmos,symbian];
     P.OSes := P.OSes - [embedded,nativent,msdos,win16,macos,palmos,symbian];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');

+ 2 - 0
packages/fcl-image/fpmake.pp

@@ -29,6 +29,8 @@ begin
     P.Description := 'Image loading and conversion parts of Free Component Libraries (FCL), FPC''s OOP library.';
     P.Description := 'Image loading and conversion parts of Free Component Libraries (FCL), FPC''s OOP library.';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes := P.OSes - [embedded,nativent,msdos,win16,macos,palmos];
     P.OSes := P.OSes - [embedded,nativent,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');

+ 2 - 0
packages/fcl-js/fpmake.pp

@@ -24,6 +24,8 @@ begin
     P.Email := '[email protected]';
     P.Email := '[email protected]';
     P.Description := 'Javascript scanner/parser/syntax tree units';
     P.Description := 'Javascript scanner/parser/syntax tree units';
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.Dependencies.Add('fcl-base');
     P.Dependencies.Add('fcl-base');
     P.Dependencies.Add('fcl-json');
     P.Dependencies.Add('fcl-json');

+ 2 - 0
packages/fcl-json/fpmake.pp

@@ -27,6 +27,8 @@ begin
     P.Description := 'Json interfacing, part of Free Component Libraries (FCL), FPC''s OOP library.';
     P.Description := 'Json interfacing, part of Free Component Libraries (FCL), FPC''s OOP library.';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
 
 

+ 2 - 0
packages/fcl-net/fpmake.pp

@@ -32,6 +32,8 @@ begin
     P.Description := 'Network related parts of Free Component Libraries (FCL), FPC''s OOP library.';
     P.Description := 'Network related parts of Free Component Libraries (FCL), FPC''s OOP library.';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes:=P.OSes-[embedded,msdos,win16,macos,palmos];
     P.OSes:=P.OSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src/unix',AllUnixOSes);
     P.IncludePath.Add('src/unix',AllUnixOSes);

+ 2 - 0
packages/fcl-passrc/fpmake.pp

@@ -26,6 +26,8 @@ begin
     P.Description := 'Pascal parsing parts of Free Component Libraries (FCL), FPC''s OOP library.';
     P.Description := 'Pascal parsing parts of Free Component Libraries (FCL), FPC''s OOP library.';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
 
 

+ 3 - 0
packages/fcl-pdf/fpmake.pp

@@ -25,6 +25,9 @@ begin
     P.Description := 'PDF generating and TTF file info library';
     P.Description := 'PDF generating and TTF file info library';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes:=P.OSes-[embedded,win16,msdos,nativent,macos,palmos];
     P.OSes:=P.OSes-[embedded,win16,msdos,nativent,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.Dependencies.Add('rtl-objpas');
     P.Dependencies.Add('rtl-objpas');
     P.Dependencies.Add('fcl-base');
     P.Dependencies.Add('fcl-base');
     P.Dependencies.Add('fcl-image');
     P.Dependencies.Add('fcl-image');

+ 2 - 0
packages/fcl-process/fpmake.pp

@@ -26,6 +26,8 @@ begin
     P.Options.Add('-S2h');
     P.Options.Add('-S2h');
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes:=AllOSes-[embedded,msdos,win16,go32v2,nativent,macos,palmos,atari];
     P.OSes:=AllOSes-[embedded,msdos,win16,go32v2,nativent,macos,palmos,atari];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src/unix',AllUnixOSes);
     P.IncludePath.Add('src/unix',AllUnixOSes);

+ 2 - 0
packages/fcl-registry/fpmake.pp

@@ -28,6 +28,8 @@ begin
     P.Description := 'Windows registry + emulation parts of Free Component Libraries (FCL), FPC''s OOP library.';
     P.Description := 'Windows registry + emulation parts of Free Component Libraries (FCL), FPC''s OOP library.';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');

+ 2 - 0
packages/fcl-res/fpmake.pp

@@ -25,6 +25,8 @@ begin
     P.Description := 'Resource handling of Free Component Libraries (FCL), FPC''s OOP library.';
     P.Description := 'Resource handling of Free Component Libraries (FCL), FPC''s OOP library.';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');

+ 2 - 0
packages/fcl-sdo/fpmake.pp

@@ -26,6 +26,8 @@ begin
     P.Email := '[email protected]';
     P.Email := '[email protected]';
     P.Description := 'Free Pascal implementation of Service Data Objects';
     P.Description := 'Free Pascal implementation of Service Data Objects';
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     // P.NeedLibC:= false;
     // P.NeedLibC:= false;
     P.SourcePath.Add('src/base');
     P.SourcePath.Add('src/base');

+ 2 - 0
packages/fcl-sound/fpmake.pp

@@ -27,6 +27,8 @@ begin
     P.Description := 'Sound loading, storing and conversion parts for the Free Component Libraries (FCL), FPC''s OOP library.';
     P.Description := 'Sound loading, storing and conversion parts for the Free Component Libraries (FCL), FPC''s OOP library.';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
 
 

+ 2 - 0
packages/fcl-stl/fpmake.pp

@@ -26,6 +26,8 @@ begin
     P.Description := 'Generic container library of Free Component Libraries (FCL), FPC''s OOP library.';
     P.Description := 'Generic container library of Free Component Libraries (FCL), FPC''s OOP library.';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes:=AllOSes-[embedded];
     P.OSes:=AllOSes-[embedded];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.Options.Add('-S2h');
     P.Options.Add('-S2h');
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');

+ 2 - 0
packages/fcl-xml/fpmake.pp

@@ -31,6 +31,8 @@ begin
     P.Description := 'XML and DOM parts of Free Component Libraries (FCL), FPC''s OOP library.';
     P.Description := 'XML and DOM parts of Free Component Libraries (FCL), FPC''s OOP library.';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');

+ 2 - 0
packages/fftw/fpmake.pp

@@ -26,6 +26,8 @@ begin
     P.Description := 'Library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data';
     P.Description := 'Library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data';
     P.NeedLibC:= true; // should be true for a header linking to C?
     P.NeedLibC:= true; // should be true for a header linking to C?
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx];
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
 
 

+ 2 - 0
packages/fpmkunit/fpmake.pp

@@ -26,6 +26,8 @@ begin
     P.Description := 'Basic library of the fpmake/fppkg build system.';
     P.Description := 'Basic library of the fpmake/fppkg build system.';
     P.NeedLibC:= false;  // true for headers that indirectly link to libc?
     P.NeedLibC:= false;  // true for headers that indirectly link to libc?
     P.OSes := P.OSes - [embedded,nativent,msdos,win16,atari,macos,palmos];
     P.OSes := P.OSes - [embedded,nativent,msdos,win16,atari,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     // All dependencies (including implicit) are listed
     // All dependencies (including implicit) are listed
     // here to be able to update all requirements to
     // here to be able to update all requirements to

+ 2 - 0
packages/fppkg/fpmake.pp

@@ -45,6 +45,8 @@ begin
     P.Description := 'Libraries to create fppkg package managers.';
     P.Description := 'Libraries to create fppkg package managers.';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes := P.OSes - [embedded,nativent,msdos,win16,atari,macos,palmos,symbian];
     P.OSes := P.OSes - [embedded,nativent,msdos,win16,atari,macos,palmos,symbian];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');

+ 2 - 0
packages/gdbm/fpmake.pp

@@ -24,6 +24,8 @@ begin
     P.Description := 'GNU dbm is a set of database routines that use extensible hashing.';
     P.Description := 'GNU dbm is a set of database routines that use extensible hashing.';
     P.NeedLibC:= true;  // true for headers that indirectly link to libc?
     P.NeedLibC:= true;  // true for headers that indirectly link to libc?
     P.OSes := AllUnixOSes - [qnx];
     P.OSes := AllUnixOSes - [qnx];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
 
 

+ 3 - 0
packages/hash/fpmake.pp

@@ -24,6 +24,9 @@ begin
     P.Description := 'Several hash and cryptography algorithms (MD5,CRC,Linux crypt and NTLM1).';
     P.Description := 'Several hash and cryptography algorithms (MD5,CRC,Linux crypt and NTLM1).';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes:=P.OSes-[embedded,win16,macos,palmos];
     P.OSes:=P.OSes-[embedded,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.Dependencies.Add('rtl-objpas');
     P.Dependencies.Add('rtl-objpas');
 
 
     P.Version:='3.3.1';
     P.Version:='3.3.1';

+ 2 - 0
packages/hermes/fpmake.pp

@@ -26,6 +26,8 @@ begin
     P.Description := 'Library for pixel graphics conversion';
     P.Description := 'Library for pixel graphics conversion';
     P.NeedLibC := false;
     P.NeedLibC := false;
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');

+ 3 - 0
packages/httpd22/fpmake.pp

@@ -25,6 +25,9 @@ begin
     P.Description := 'Headers for the Apache 2.2 series www server';
     P.Description := 'Headers for the Apache 2.2 series www server';
     P.NeedLibC:= true;  // true for headers that indirectly link to libc?
     P.NeedLibC:= true;  // true for headers that indirectly link to libc?
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx];
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.Dependencies.Add('rtl-extra');
     P.Dependencies.Add('rtl-extra');
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');

+ 2 - 0
packages/httpd24/fpmake.pp

@@ -25,6 +25,8 @@ begin
     P.Description := 'Headers for the Apache 2.4 series www server';
     P.Description := 'Headers for the Apache 2.4 series www server';
     P.NeedLibC:= true;  // true for headers that indirectly link to libc?
     P.NeedLibC:= true;  // true for headers that indirectly link to libc?
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx];
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.SourcePath.Add('src/apr');
     P.SourcePath.Add('src/apr');

+ 2 - 0
packages/ibase/fpmake.pp

@@ -25,6 +25,8 @@ begin
     P.Description := 'Headers for the Interbase/Firebird RDBMS';
     P.Description := 'Headers for the Interbase/Firebird RDBMS';
     P.NeedLibC:= true;  // true for headers that indirectly link to libc?
     P.NeedLibC:= true;  // true for headers that indirectly link to libc?
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx];
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');

+ 2 - 0
packages/imagemagick/fpmake.pp

@@ -25,6 +25,8 @@ begin
     P.Description := 'Header to Imagemagick, a graphics manipulation program .';
     P.Description := 'Header to Imagemagick, a graphics manipulation program .';
     P.NeedLibC:= true;  // true for headers that indirectly link to libc?
     P.NeedLibC:= true;  // true for headers that indirectly link to libc?
     P.OSes := AllUnixOSes+[win32,win64]-[qnx];
     P.OSes := AllUnixOSes+[win32,win64]-[qnx];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');

+ 3 - 0
packages/libenet/fpmake.pp

@@ -23,6 +23,9 @@ begin
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');
     { only enable for darwin after testing }
     { only enable for darwin after testing }
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx,darwin,iphonesim];
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx,darwin,iphonesim];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.Dependencies.Add('rtl-extra'); // winsock2
     P.Dependencies.Add('rtl-extra'); // winsock2
     
     
     T:=P.Targets.AddUnit('enettypes.pp');
     T:=P.Targets.AddUnit('enettypes.pp');

+ 2 - 0
packages/libgd/fpmake.pp

@@ -21,6 +21,8 @@ begin
     P.Version:='3.3.1';
     P.Version:='3.3.1';
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.OSes := P.OSes - [embedded,nativent,msdos,wii,win16,atari,macos,palmos,symbian];
     P.OSes := P.OSes - [embedded,nativent,msdos,wii,win16,atari,macos,palmos,symbian];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     T:=P.Targets.AddUnit('gd.pas');
     T:=P.Targets.AddUnit('gd.pas');
 
 

+ 3 - 0
packages/libmicrohttpd/fpmake.pp

@@ -25,6 +25,9 @@ begin
     P.NeedLibC:= true;
     P.NeedLibC:= true;
     P.Dependencies.Add('rtl-extra');
     P.Dependencies.Add('rtl-extra');
     P.OSes := [android,freebsd,linux,netbsd,openbsd,win32,win64];
     P.OSes := [android,freebsd,linux,netbsd,openbsd,win32,win64];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');
     T:=P.Targets.AddUnit('libmicrohttpd.pp');
     T:=P.Targets.AddUnit('libmicrohttpd.pp');

+ 2 - 0
packages/libpng/fpmake.pp

@@ -22,6 +22,8 @@ begin
     P.Dependencies.Add('zlib');
     P.Dependencies.Add('zlib');
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.OSes := AllUnixOSes-[qnx]+[win32,os2,emx];
     P.OSes := AllUnixOSes-[qnx]+[win32,os2,emx];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     T:=P.Targets.AddUnit('png.pp');
     T:=P.Targets.AddUnit('png.pp');
 {$ifndef ALLPACKAGES}
 {$ifndef ALLPACKAGES}

+ 2 - 0
packages/libtar/fpmake.pp

@@ -25,6 +25,8 @@ begin
     P.Description := 'Library for handling tar-files.';
     P.Description := 'Library for handling tar-files.';
 
 
     P.OSes:=AllOSes-[embedded,win16,macos,palmos];
     P.OSes:=AllOSes-[embedded,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     T:=P.Targets.AddUnit('libtar.pp');
     T:=P.Targets.AddUnit('libtar.pp');

+ 2 - 0
packages/mysql/fpmake.pp

@@ -21,6 +21,8 @@ begin
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx];
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     T:=P.Targets.AddUnit('my4_sys.pp');
     T:=P.Targets.AddUnit('my4_sys.pp');
     T:=P.Targets.AddUnit('mysql3_comdyn.pp');
     T:=P.Targets.AddUnit('mysql3_comdyn.pp');

+ 2 - 0
packages/numlib/fpmake.pp

@@ -20,6 +20,8 @@ begin
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');
     P.OSes := AllUnixOSes+AllWindowsOSes+AllAmigaLikeOSes-[qnx];
     P.OSes := AllUnixOSes+AllWindowsOSes+AllAmigaLikeOSes-[qnx];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 //    P.Dependencies.Add('x11');
 //    P.Dependencies.Add('x11');
 
 
     T:=P.Targets.AddUnit('det.pas');
     T:=P.Targets.AddUnit('det.pas');

+ 3 - 0
packages/odbc/fpmake.pp

@@ -18,6 +18,9 @@ begin
 {$endif ALLPACKAGES}
 {$endif ALLPACKAGES}
     P.Version:='3.3.1';
     P.Version:='3.3.1';
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx];
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');
 
 

+ 3 - 0
packages/openssl/fpmake.pp

@@ -21,6 +21,9 @@ begin
     P.Version:='3.3.1';
     P.Version:='3.3.1';
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.OSes := AllUnixOSes+AllWindowsOSes+[OS2,EMX]-[qnx];
     P.OSes := AllUnixOSes+AllWindowsOSes+[OS2,EMX]-[qnx];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.Dependencies.Add('rtl-extra',[OS2,EMX]);
     P.Dependencies.Add('rtl-extra',[OS2,EMX]);
 
 
     T:=P.Targets.AddUnit('openssl.pas');
     T:=P.Targets.AddUnit('openssl.pas');

+ 2 - 0
packages/oracle/fpmake.pp

@@ -21,6 +21,8 @@ begin
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx];
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     T:=P.Targets.AddUnit('ocidyn.pp');
     T:=P.Targets.AddUnit('ocidyn.pp');
       with T.Dependencies do
       with T.Dependencies do

+ 2 - 0
packages/pasjpeg/fpmake.pp

@@ -20,6 +20,8 @@ begin
 {$endif ALLPACKAGES}
 {$endif ALLPACKAGES}
     P.Version:='3.3.1';
     P.Version:='3.3.1';
     P.OSes:=P.OSes-[embedded,msdos,win16,macos,palmos];
     P.OSes:=P.OSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');

+ 3 - 0
packages/pastojs/fpmake.pp

@@ -20,6 +20,9 @@ begin
 
 
     P.Version:='3.3.1';
     P.Version:='3.3.1';
     P.OSes:=AllUnixOSes+AllBSDOSes+AllWindowsOSes-[WinCE];
     P.OSes:=AllUnixOSes+AllBSDOSes+AllWindowsOSes-[WinCE];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.Dependencies.Add('paszlib');
     P.Dependencies.Add('paszlib');
     P.Dependencies.Add('fcl-js');
     P.Dependencies.Add('fcl-js');
     P.Dependencies.Add('fcl-json');
     P.Dependencies.Add('fcl-json');

+ 2 - 0
packages/paszlib/fpmake.pp

@@ -21,6 +21,8 @@ begin
 {$endif ALLPACKAGES}
 {$endif ALLPACKAGES}
     P.Version:='3.3.1';
     P.Version:='3.3.1';
     P.OSes := P.OSes - [embedded,nativent,msdos,win16,macos,palmos];
     P.OSes := P.OSes - [embedded,nativent,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     D:=P.Dependencies.Add('hash');
     D:=P.Dependencies.Add('hash');
       D.Version:='3.3.1';
       D.Version:='3.3.1';

+ 3 - 0
packages/pcap/fpmake.pp

@@ -19,6 +19,9 @@ begin
     P.Version:='3.3.1';
     P.Version:='3.3.1';
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.OSes := AllUnixOSes+[win32]-[qnx];
     P.OSes := AllUnixOSes+[win32]-[qnx];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.Dependencies.Add('rtl-extra');
     P.Dependencies.Add('rtl-extra');
 
 
     T:=P.Targets.AddUnit('pcap.pp');
     T:=P.Targets.AddUnit('pcap.pp');

+ 2 - 0
packages/postgres/fpmake.pp

@@ -20,6 +20,8 @@ begin
     P.Version:='3.3.1';
     P.Version:='3.3.1';
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.OSes := AllUnixOSes-[qnx]+AllWindowsOSes;
     P.OSes := AllUnixOSes-[qnx]+AllWindowsOSes;
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');
 
 

+ 3 - 0
packages/pthreads/fpmake.pp

@@ -18,6 +18,9 @@ begin
 {$endif ALLPACKAGES}
 {$endif ALLPACKAGES}
     P.Version:='3.3.1';
     P.Version:='3.3.1';
     P.OSes := [beos,haiku,freebsd,darwin,iphonesim,solaris,netbsd,openbsd,linux,aix,dragonfly,android];
     P.OSes := [beos,haiku,freebsd,darwin,iphonesim,solaris,netbsd,openbsd,linux,aix,dragonfly,android];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');
 
 

+ 3 - 0
packages/regexpr/fpmake.pp

@@ -20,6 +20,9 @@ begin
 {$endif ALLPACKAGES}
 {$endif ALLPACKAGES}
     P.Version:='3.3.1';
     P.Version:='3.3.1';
     P.OSes:=P.OSes-[embedded,win16,macos,palmos];
     P.OSes:=P.OSes-[embedded,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.Dependencies.Add('rtl-objpas');
     P.Dependencies.Add('rtl-objpas');
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
 
 

+ 3 - 0
packages/rtl-console/fpmake.pp

@@ -41,6 +41,9 @@ begin
     P.License := 'LGPL with modification, ';
     P.License := 'LGPL with modification, ';
     P.HomepageURL := 'www.freepascal.org';
     P.HomepageURL := 'www.freepascal.org';
     P.OSes:=Rtl_ConsoleOSes;
     P.OSes:=Rtl_ConsoleOSes;
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.Email := '';
     P.Email := '';
     P.Description := 'Rtl-console, console abstraction';
     P.Description := 'Rtl-console, console abstraction';
     P.NeedLibC:= false;
     P.NeedLibC:= false;

+ 3 - 0
packages/rtl-extra/fpmake.pp

@@ -48,6 +48,9 @@ begin
     P.License := 'LGPL with modification, ';
     P.License := 'LGPL with modification, ';
     P.HomepageURL := 'www.freepascal.org';
     P.HomepageURL := 'www.freepascal.org';
     P.OSes:=AllTargetsextra;
     P.OSes:=AllTargetsextra;
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.Email := '';
     P.Email := '';
     P.Description := 'Rtl-extra, RTL not needed for bootstrapping';
     P.Description := 'Rtl-extra, RTL not needed for bootstrapping';
     P.NeedLibC:= false;
     P.NeedLibC:= false;

+ 3 - 0
packages/rtl-generics/fpmake.pp

@@ -24,6 +24,9 @@ begin
     P.Description := 'Generic collection library.';
     P.Description := 'Generic collection library.';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes := AllOSes-[embedded,win16,macos,palmos];
     P.OSes := AllOSes-[embedded,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.Directory:=ADirectory;
     P.Directory:=ADirectory;
     P.Version:='3.3.1';
     P.Version:='3.3.1';
     P.Dependencies.Add('rtl-objpas');
     P.Dependencies.Add('rtl-objpas');

+ 3 - 0
packages/rtl-objpas/fpmake.pp

@@ -46,6 +46,9 @@ begin
     P.License := 'LGPL with modification, ';
     P.License := 'LGPL with modification, ';
     P.HomepageURL := 'www.freepascal.org';
     P.HomepageURL := 'www.freepascal.org';
     P.OSes:=AllTargetsObjPas;
     P.OSes:=AllTargetsObjPas;
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.Email := '';
     P.Email := '';
     P.Description := 'Rtl-objpas, aux. Delphi compat units';
     P.Description := 'Rtl-objpas, aux. Delphi compat units';
     P.NeedLibC:= false;
     P.NeedLibC:= false;

+ 3 - 0
packages/rtl-unicode/fpmake.pp

@@ -39,6 +39,9 @@ begin
     P.License := 'LGPL with modification, ';
     P.License := 'LGPL with modification, ';
     P.HomepageURL := 'www.freepascal.org';
     P.HomepageURL := 'www.freepascal.org';
     P.OSes:=unicodeAllOSes;
     P.OSes:=unicodeAllOSes;
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.Email := '';
     P.Email := '';
     P.Description := 'Rtl-unicode, misc Unicode units';
     P.Description := 'Rtl-unicode, misc Unicode units';
     P.NeedLibC:= false;
     P.NeedLibC:= false;

+ 3 - 0
packages/sqlite/fpmake.pp

@@ -19,6 +19,9 @@ begin
 {$endif ALLPACKAGES}
 {$endif ALLPACKAGES}
     P.Version:='3.3.1';
     P.Version:='3.3.1';
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx,win16];
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx,win16];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');
 
 

+ 2 - 0
packages/symbolic/fpmake.pp

@@ -24,6 +24,8 @@ begin
     P.Description := 'Expression parser with support for fast evaluation';
     P.Description := 'Expression parser with support for fast evaluation';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes:=P.OSes-[embedded,msdos,win16,macos,palmos];
     P.OSes:=P.OSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
     P.IncludePath.Add('src');

+ 2 - 0
packages/tcl/fpmake.pp

@@ -20,6 +20,8 @@ begin
     P.Version:='3.3.1';
     P.Version:='3.3.1';
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.OSes := AllUnixOSes+AllWindowsOSes+[os2,emx]-[qnx,win16];
     P.OSes := AllUnixOSes+AllWindowsOSes+[os2,emx]-[qnx,win16];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     T:=P.Targets.AddUnit('tcl80.pp');
     T:=P.Targets.AddUnit('tcl80.pp');
 
 

+ 2 - 0
packages/unzip/fpmake.pp

@@ -21,6 +21,8 @@ begin
     P.Version:='3.3.1';
     P.Version:='3.3.1';
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
     P.OSes := P.OSes - [embedded,nativent,msdos,win16,macos,palmos];
     P.OSes := P.OSes - [embedded,nativent,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     T:=P.Targets.AddUnit('unzip51g.pp');
     T:=P.Targets.AddUnit('unzip51g.pp');
       with T.Dependencies do
       with T.Dependencies do

+ 2 - 0
packages/webidl/fpmake.pp

@@ -26,6 +26,8 @@ begin
     P.Description := 'WEB IDL parser and converter to Object Pascal classes';
     P.Description := 'WEB IDL parser and converter to Object Pascal classes';
     P.NeedLibC:= false;
     P.NeedLibC:= false;
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
     P.OSes:=AllOSes-[embedded,msdos,win16,macos,palmos];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
 
 
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
 
 

+ 3 - 0
packages/zlib/fpmake.pp

@@ -19,6 +19,9 @@ begin
 {$endif ALLPACKAGES}
 {$endif ALLPACKAGES}
     P.Version:='3.3.1';
     P.Version:='3.3.1';
     P.OSes := AllUnixOSes+AllWindowsOSes+[os2,emx,netware,netwlibc]-[qnx];
     P.OSes := AllUnixOSes+AllWindowsOSes+[os2,emx,netware,netwlibc]-[qnx];
+    if Defaults.CPU=jvm then
+      P.OSes := P.OSes - [java,android];
+
     P.SourcePath.Add('src');
     P.SourcePath.Add('src');
 
 
     T:=P.Targets.AddUnit('zlib.pp');
     T:=P.Targets.AddUnit('zlib.pp');