Commit c3c7a0d2 authored by Richard Levitte's avatar Richard Levitte
Browse files

First attempt at adding the possibility to set the pointer size for the builds on VMS. 

PR: 2393
parent d06bc800

VMS/mkshared.com

+24 −5
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ $ libopt = "''libdir'LIBCRYPTO.OPT" 
$   libmap = "''libdir'LIBCRYPTO.MAP"

$   libgoal= "''libdir'LIBCRYPTO.EXE"

$   libref = ""

$   gosub create_nonvax_shr

$   if f$search(libdir+libolb) .nes. "" then gosub create_nonvax_shr

$   libid  = "SSL"

$   libnum = "[.UTIL]SSLEAY.NUM"

$   libdir = "[.''ARCH'.EXE.SSL]"
@@ -47,7 +47,26 @@ $ libopt = "''libdir'LIBSSL.OPT" 
$   libmap = "''libdir'LIBSSL.MAP"

$   libgoal= "''libdir'LIBSSL.EXE"

$   libref = "[.''ARCH'.EXE.CRYPTO]LIBCRYPTO.EXE"

$   gosub create_nonvax_shr

$   if f$search(libdir+libolb) .nes. "" then gosub create_nonvax_shr

$   arch_vax = 0

$   libid  = "Crypto"

$   libnum = "[.UTIL]LIBEAY.NUM"

$   libdir = "[.''ARCH'.EXE.CRYPTO]"

$   libolb = "''libdir'LIBCRYPTO32.OLB"

$   libopt = "''libdir'LIBCRYPTO32.OPT"

$   libmap = "''libdir'LIBCRYPTO32.MAP"

$   libgoal= "''libdir'LIBCRYPTO32.EXE"

$   libref = ""

$   if f$search(libdir+libolb) .nes. "" then gosub create_nonvax_shr

$   libid  = "SSL"

$   libnum = "[.UTIL]SSLEAY.NUM"

$   libdir = "[.''ARCH'.EXE.SSL]"

$   libolb = "''libdir'LIBSSL32.OLB"

$   libopt = "''libdir'LIBSSL32.OPT"

$   libmap = "''libdir'LIBSSL32.MAP"

$   libgoal= "''libdir'LIBSSL32.EXE"

$   libref = "[.''ARCH'.EXE.CRYPTO]LIBCRYPTO32.EXE"

$   if f$search(libdir+libolb) .nes. "" then gosub create_nonvax_shr

$ else

$   arch_vax = 1

$   libtit = "CRYPTO_TRANSFER_VECTOR"
@@ -62,7 +81,7 @@ $ libmap = "''libdir'LIBCRYPTO.MAP" 
$   libgoal= "''libdir'LIBCRYPTO.EXE"

$   libref = ""

$   libvec = "LIBCRYPTO"

$   gosub create_vax_shr

$   if f$search(libdir+libolb) .nes. "" then gosub create_vax_shr

$   libtit = "SSL_TRANSFER_VECTOR"

$   libid  = "SSL"

$   libnum = "[.UTIL]SSLEAY.NUM"
@@ -75,11 +94,11 @@ $ libmap = "''libdir'LIBSSL.MAP" 
$   libgoal= "''libdir'LIBSSL.EXE"

$   libref = "[.''ARCH'.EXE.CRYPTO]LIBCRYPTO.EXE"

$   libvec = "LIBSSL"

$   gosub create_vax_shr

$   if f$search(libdir+libolb) .nes. "" then gosub create_vax_shr

$ endif

$ exit

$

$! ----- Soubroutines to build the shareable libraries

$! ----- Subroutines to build the shareable libraries

$! For each supported architecture, there's a main shareable library

$! creator, which is called from the main code above.

$! The creator will define a number of variables to tell the next levels of

apps/makeapps.com

+55 −3
Original line number Diff line number Diff line
@@ -39,6 +39,13 @@ $! P4, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up) 
$!

$!  P5, if defined, sets a choice of programs to compile.

$!

$!  For 64 bit architectures (Alpha and IA64), specify the pointer size as P6.

$!  For 32 bit architectures (VAX), P6 is ignored.

$!  Currently supported values are:

$!

$!	32	To ge a library compiled with /POINTER_SIZE=32

$!	64	To ge a library compiled with /POINTER_SIZE=64

$!

$!

$! Define A TCP/IP Library That We Will Need To Link To.

$! (That Is, If We Need To Link To One.)
@@ -73,11 +80,11 @@ $ PROGRAMS := OPENSSL 
$!

$! Define The CRYPTO Library.

$!

$ CRYPTO_LIB := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO.OLB

$ CRYPTO_LIB := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO'LIB32'.OLB

$!

$! Define The SSL Library.

$!

$ SSL_LIB := SYS$DISK:[-.'ARCH'.EXE.SSL]LIBSSL.OLB

$ SSL_LIB := SYS$DISK:[-.'ARCH'.EXE.SSL]LIBSSL'LIB32'.OLB

$!

$! Define The OBJ Directory.

$!
@@ -563,6 +570,51 @@ $! End The P1 Check. 
$!

$ ENDIF

$!

$!  Check is P6 Is Valid

$!

$   IF (P6.EQS."32")

$   THEN

$     POINTER_SIZE = "/POINTER_SIZE=32"

$     IF ARCH .EQS. "VAX"

$     THEN

$       LIB32 = ""

$     ELSE

$       LIB32 = "32"

$     ENDIF

$   ELSE

$     IF (P6.EQS."64")

$     THEN

$       LIB32 = ""

$       IF ARCH .EQS. "VAX"

$       THEN

$         POINTER_SIZE = "/POINTER_SIZE=32"

$       ELSE

$         POINTER_SIZE = "/POINTER_SIZE=64"

$       ENDIF

$     ELSE

$!

$!      Tell The User Entered An Invalid Option..

$!

$       WRITE SYS$OUTPUT ""

$       WRITE SYS$OUTPUT "The Option ",P6," Is Invalid.  The Valid Options Are:"

$       WRITE SYS$OUTPUT ""

$       WRITE SYS$OUTPUT "    32  :  Compile with 32 bit pointer size"

$       WRITE SYS$OUTPUT "    64  :  Compile with 64 bit pointer size"

$       WRITE SYS$OUTPUT ""

$!

$!      Time To EXIT.

$!

$       GOTO TIDY

$!

$!      End The Valid Arguement Check.

$!

$     ENDIF

$   ENDIF

$!

$! End The P6 Check.

$!

$ ENDIF

$!

$! Check To See If P2 Is Blank.

$!

$ IF (P2.EQS."")
@@ -690,7 +742,7 @@ $! 
$     CC = "CC"

$     IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" -

	 THEN CC = "CC/DECC"

$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + -

$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89''POINTER_SIZE'" + -

           "/NOLIST/PREFIX=ALL" + -

	   "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS

$!

crypto/crypto-lib.com

+62 −3
Original line number Diff line number Diff line
@@ -47,6 +47,13 @@ $! P6, if defined, sets a choice of crypto methods to compile. 
$!  WARNING: this should only be done to recompile some part of an already

$!  fully compiled library.

$!

$!  For 64 bit architectures (Alpha and IA64), specify the pointer size as P7.

$!  For 32 bit architectures (VAX), P7 is ignored.

$!  Currently supported values are:

$!

$!	32	To ge a library compiled with /POINTER_SIZE=32

$!	64	To ge a library compiled with /POINTER_SIZE=64

$!

$!

$! Define A TCP/IP Library That We Will Need To Link To.

$! (That Is, If We Need To Link To One.)
@@ -140,11 +147,11 @@ $ ENDIF 
$!

$! Define The Library Name.

$!

$ LIB_NAME := 'EXE_DIR'LIBCRYPTO.OLB

$ LIB_NAME := 'EXE_DIR'LIBCRYPTO'LIB32'.OLB

$!

$! Define The CRYPTO-LIB We Are To Use.

$!

$ CRYPTO_LIB := 'EXE_DIR'LIBCRYPTO.OLB

$ CRYPTO_LIB := 'EXE_DIR'LIBCRYPTO'LIB32'.OLB

$!

$! Check To See If We Already Have A "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" Library...

$!
@@ -907,6 +914,58 @@ $! End The P5 Check. 
$!

$ ENDIF

$!

$! Check To See If P7 Is Blank.

$!

$ IF (P7.EQS."")

$ THEN

$   POINTER_SIZE = ""

$ ELSE

$!

$!  Check is P7 Is Valid

$!

$   IF (P7.EQS."32")

$   THEN

$     POINTER_SIZE = "/POINTER_SIZE=32"

$     IF ARCH .EQS. "VAX"

$     THEN

$       LIB32 = ""

$     ELSE

$       LIB32 = "32"

$     ENDIF

$   ELSE

$     IF (P7.EQS."64")

$     THEN

$       LIB32 = ""

$       IF ARCH .EQS. "VAX"

$       THEN

$         POINTER_SIZE = "/POINTER_SIZE=32"

$       ELSE

$         POINTER_SIZE = "/POINTER_SIZE=64"

$       ENDIF

$     ELSE

$!

$!      Tell The User Entered An Invalid Option..

$!

$       WRITE SYS$OUTPUT ""

$       WRITE SYS$OUTPUT "The Option ",P7," Is Invalid.  The Valid Options Are:"

$       WRITE SYS$OUTPUT ""

$       WRITE SYS$OUTPUT "    32  :  Compile with 32 bit pointer size"

$       WRITE SYS$OUTPUT "    64  :  Compile with 64 bit pointer size"

$       WRITE SYS$OUTPUT ""

$!

$!      Time To EXIT.

$!

$       GOTO TIDY

$!

$!      End The Valid Arguement Check.

$!

$     ENDIF

$   ENDIF

$!

$! End The P7 Check.

$!

$ ENDIF

$!

$! Check To See If P3 Is Blank.

$!

$ IF (P3.EQS."")
@@ -1034,7 +1093,7 @@ $! 
$     CC = "CC"

$     IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" -

	 THEN CC = "CC/DECC"

$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + -

$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89''POINTER_SIZE'" + -

           "/NOLIST/PREFIX=ALL" + -

	   "/INCLUDE=(SYS$DISK:[._''ARCH'],SYS$DISK:[],SYS$DISK:[-],SYS$DISK:[.ENGINE.VENDOR_DEFNS],SYS$DISK:[.EVP],SYS$DISK:[.ASN1])" + -

	   CCEXTRAFLAGS

crypto/install.com

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ $ EXHEADER_CMS := cms.h 
$	EXHEADER_PQUEUE := pqueue.h

$	EXHEADER_TS := ts.h

$	EXHEADER_JPAKE := jpake.h

$	LIBS := LIBCRYPTO

$	LIBS := LIBCRYPTO,LIBCRYPTO32

$

$	EXE_DIR := [-.'ARCH'.EXE.CRYPTO]

$

engines/makeengines.com

+62 −2
Original line number Diff line number Diff line
@@ -28,6 +28,13 @@ $! 
$!  P6	if defined, denotes which engines to build.  If not defined,

$!	all available engines are built.

$!

$!  For 64 bit architectures (Alpha and IA64), specify the pointer size as P7.

$!  For 32 bit architectures (VAX), P7 is ignored.

$!  Currently supported values are:

$!

$!	32	To ge a library compiled with /POINTER_SIZE=32

$!	64	To ge a library compiled with /POINTER_SIZE=64

$!

$!-----------------------------------------------------------------------------

$!

$! Set the default TCP/IP library to link against if needed
@@ -81,7 +88,7 @@ $ IF F$PARSE(EXE_DIR) .EQS. "" THEN CREATE/DIRECTORY 'EXE_DIR' 
$!

$! Set the goal files, and create them if necessary

$!

$ CRYPTO_LIB :=SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO.OLB

$ CRYPTO_LIB :=SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO'LIB32'.OLB

$ IF F$SEARCH(CRYPTO_LIB) .EQS. "" THEN LIBRARY/CREATE/OBJECT 'CRYPTO_LIB'

$!

$! OK, time to check options and initialise
@@ -92,6 +99,7 @@ $ OPT_DEBUG = P2 
$ OPT_COMPILER = P3

$ OPT_TCPIP_LIB = P4

$ OPT_SPECIAL_THREADS = P5

$ OPT_POINTER_SIZE = P7

$

$ GOSUB CHECK_OPTIONS

$ GOSUB INITIALISE
@@ -557,6 +565,58 @@ $! End The OPT_SPECIAL_THREADS Check. 
$!

$ ENDIF

$!

$! Check To See If OPT_POINTER_SIZE Is Blank.

$!

$ IF (OPT_POINTER_SIZE.EQS."")

$ THEN

$   POINTER_SIZE = ""

$ ELSE

$!

$!  Check is OPT_POINTER_SIZE Is Valid

$!

$   IF (OPT_POINTER_SIZE.EQS."32")

$   THEN

$     POINTER_SIZE = "/POINTER_SIZE=32"

$     IF ARCH .EQS. "VAX"

$     THEN

$       LIB32 = ""

$     ELSE

$       LIB32 = "32"

$     ENDIF

$   ELSE

$     IF (OPT_POINTER_SIZE.EQS."64")

$     THEN

$       LIB32 = ""

$       IF ARCH .EQS. "VAX"

$       THEN

$         POINTER_SIZE = "/POINTER_SIZE=32"

$       ELSE

$         POINTER_SIZE = "/POINTER_SIZE=64"

$       ENDIF

$     ELSE

$!

$!      Tell The User Entered An Invalid Option..

$!

$       WRITE SYS$OUTPUT ""

$       WRITE SYS$OUTPUT "The Option ",OPT_POINTER_SIZE," Is Invalid.  The Valid Options Are:"

$       WRITE SYS$OUTPUT ""

$       WRITE SYS$OUTPUT "    32  :  Compile with 32 bit pointer size"

$       WRITE SYS$OUTPUT "    64  :  Compile with 64 bit pointer size"

$       WRITE SYS$OUTPUT ""

$!

$!      Time To EXIT.

$!

$       GOTO TIDY

$!

$!      End The Valid Arguement Check.

$!

$     ENDIF

$   ENDIF

$!

$! End The OPT_POINTER_SIZE Check.

$!

$ ENDIF

$!

$! Check To See If OPT_COMPILER Is Blank.

$!

$ IF (OPT_COMPILER.EQS."")
@@ -684,7 +744,7 @@ $! 
$     CC = "CC"

$     IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" -

	 THEN CC = "CC/DECC"

$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + -

$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89''POINTER_SIZE'" + -

           "/NOLIST/PREFIX=ALL" + -

	   "/INCLUDE=(SYS$DISK:[],SYS$DISK:[.VENDOR_DEFNS])" + -

	   CCEXTRAFLAGS