Jelajahi Sumber

* remove openssl from netware and netwlibc (missing dynlibs support)

git-svn-id: trunk@5372 -
Almindor 18 tahun lalu
induk
melakukan
6c21e871de

+ 4 - 6
packages/extra/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/10/31]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/11/12]
 #
 default: all
 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-amiga 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
@@ -252,7 +252,7 @@ ifeq ($(FULL_TARGET),i386-solaris)
 override TARGET_DIRS+=unzip zlib fftw x11 opengl gtk gtk2 syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl libcurl
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_DIRS+=unzip zlib openssl
+override TARGET_DIRS+=unzip zlib
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 override TARGET_DIRS+=unzip zlib x11 opengl gtk syslog forms svgalib ggi libpng libgd utmp bfd gdbm ncurses fpgtk tcl imlib gnome1 openssl libcurl
@@ -264,7 +264,7 @@ ifeq ($(FULL_TARGET),i386-emx)
 override TARGET_DIRS+=os2units rexx unzip zlib x11 gtk libpng tcl imlib fpgtk
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_DIRS+=unzip zlib openssl
+override TARGET_DIRS+=unzip zlib
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 override TARGET_DIRS+=unzip zlib tcl fftw
@@ -1125,7 +1125,7 @@ ifeq ($(CPU_TARGET),powerpc)
 FPCCPUOPT:=-O1r
 endif
 else
-FPCCPUOPT:=-O2
+FPCCPUOPT:=-O1r
 endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
@@ -1538,7 +1538,6 @@ endif
 ifeq ($(FULL_TARGET),i386-netware)
 TARGET_DIRS_UNZIP=1
 TARGET_DIRS_ZLIB=1
-TARGET_DIRS_OPENSSL=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 TARGET_DIRS_UNZIP=1
@@ -1602,7 +1601,6 @@ endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 TARGET_DIRS_UNZIP=1
 TARGET_DIRS_ZLIB=1
-TARGET_DIRS_OPENSSL=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 TARGET_DIRS_UNZIP=1

+ 2 - 2
packages/extra/Makefile.fpc

@@ -48,8 +48,8 @@ dirs_emx=os2units \
 dirs_go32v2=unzip
 dirs_amiga=amunits
 dirs_palmos=palmunits
-dirs_netware=unzip zlib openssl
-dirs_netwlibc=unzip zlib openssl
+dirs_netware=unzip zlib
+dirs_netwlibc=unzip zlib
 dirs_darwin= unzip zlib fftw \
              x11 opengl gtk gtk2 syslog \
              forms libpng libgd \

+ 1 - 1
packages/extra/openssl/fpmake.inc

@@ -4,6 +4,6 @@
     {$ELSEIF defined(EXTRAPACKAGES)}
     Directory:='openssl';
     {$ENDIF}
-    OS:=[linux,netbsd,freebsd,openbsd,win32,win64,darwin,netwlibc,netware,solaris];
+    OS:=[linux,netbsd,freebsd,openbsd,win32,win64,darwin,solaris];
     T:=Targets.AddUnit('openssl');
     EndPackage;