[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openssl-cvs
Subject:    [CVS] OpenSSL: openssl/ Configure Makefile.shared TABLE
From:       "Andy Polyakov" <appro () openssl ! org>
Date:       2007-03-25 15:20:35
Message-ID: 20070325152035.AD0A51AC60C6 () master ! openssl ! org
[Download RAW message or body]

  OpenSSL CVS Repository
  http://cvs.openssl.org/
  ____________________________________________________________________________

  Server: cvs.openssl.org                  Name:   Andy Polyakov
  Root:   /v/openssl/cvs                   Email:  appro@openssl.org
  Module: openssl                          Date:   25-Mar-2007 17:20:35
  Branch: HEAD                             Handle: 2007032516203401

  Modified files:
    openssl                 Configure Makefile.shared TABLE

  Log:
    Allow shared builds for aix[64]-gcc targets.

  Summary:
    Revision    Changes     Path
    1.552       +2  -2      openssl/Configure
    1.63        +5  -5      openssl/Makefile.shared
    1.218       +6  -6      openssl/TABLE
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/Configure
  ============================================================================
  $ cvs diff -u -r1.551 -r1.552 Configure
  --- openssl/Configure	25 Mar 2007 15:13:51 -0000	1.551
  +++ openssl/Configure	25 Mar 2007 15:20:34 -0000	1.552
  @@ -411,8 +411,8 @@
   
   #### IBM's AIX.
   "aix3-cc",  "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG \
                RC4_CHAR:::",
  -"aix-gcc",  "gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o \
                aix_ppc32-mont.o:::::sha1-ppc_aix32.o \
                sha256-ppc_aix32.o::::::dlfcn:",
  -"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG \
RC4_CHAR::aix_ppc64.o aix_ppc64-mont.o:::::sha1-ppc_aix64.o sha256-ppc_aix64.o \
sha512-ppc_aix64.o::::::dlfcn::::::-X64",  +"aix-gcc",  "gcc:-O \
-DB_ENDIAN::-D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o \
aix_ppc32-mont.o:::::sha1-ppc_aix32.o \
sha256-ppc_aix32.o::::::dlfcn:aix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X \
32",  +"aix64-gcc","gcc:-maix64 -O \
-DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR::aix_ppc64.o \
aix_ppc64-mont.o:::::sha1-ppc_aix64.o sha256-ppc_aix64.o \
sha512-ppc_aix64.o::::::dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",
  # Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE
   # at build time. $OBJECT_MODE is respected at ./config stage!
   "aix-cc",   "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro \
-qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR::aix_ppc32.o \
aix_ppc32-mont.o:::::sha1-ppc_aix32.o \
sha256-ppc_aix32.o::::::dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X \
32",  @@ .
  patch -p0 <<'@@ .'
  Index: openssl/Makefile.shared
  ============================================================================
  $ cvs diff -u -r1.62 -r1.63 Makefile.shared
  --- openssl/Makefile.shared	22 Mar 2007 08:46:33 -0000	1.62
  +++ openssl/Makefile.shared	25 Mar 2007 15:20:35 -0000	1.63
  @@ -510,26 +510,26 @@
   
   link_o.aix:
   	@ $(CALC_VERSIONS); \
  -	OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]\([0-9]*\)'`; \
  +	OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]*\(64\)'` || :; \
   	OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
   	SHLIB=lib$(LIBNAME).so; \
   	SHLIB_SUFFIX=; \
   	ALLSYMSFLAGS=''; \
   	NOALLSYMSFLAGS=''; \
  -	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -G -bexpall -bnolibpath -bM:SRE'; \
  +	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-G,-bexpall,-bnolibpath,-bM:SRE'; \
   	$(LINK_SO_O);
   link_a.aix:
   	@ $(CALC_VERSIONS); \
  -	OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]\([0-9]*\)'`; \
  +	OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]*\(64\)'` || : ; \
   	OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
   	SHLIB=lib$(LIBNAME).so; \
   	SHLIB_SUFFIX=; \
   	ALLSYMSFLAGS='-bnogc'; \
   	NOALLSYMSFLAGS=''; \
  -	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -G -bexpall -bnolibpath -bM:SRE'; \
  +	SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-G,-bexpall,-bnolibpath,-bM:SRE'; \
   	$(LINK_SO_A_VIA_O)
   link_app.aix:
  -	LDFLAGS="$(CFLAGS) -brtl -blibpath:$(LIBRPATH):$${LIBPATH:-/usr/lib:/lib}"; \
  +	LDFLAGS="$(CFLAGS) -Wl,-brtl,-blibpath:$(LIBRPATH):$${LIBPATH:-/usr/lib:/lib}"; \
   	$(LINK_APP)
   
   link_o.reliantunix:
  @@ .
  patch -p0 <<'@@ .'
  Index: openssl/TABLE
  ============================================================================
  $ cvs diff -u -r1.217 -r1.218 TABLE
  --- openssl/TABLE	25 Mar 2007 15:13:51 -0000	1.217
  +++ openssl/TABLE	25 Mar 2007 15:20:35 -0000	1.218
  @@ -749,12 +749,12 @@
   $rc5_obj      = 
   $wp_obj       = 
   $dso_scheme   = dlfcn
  -$shared_target= 
  +$shared_target= aix-shared
   $shared_cflag = 
   $shared_ldflag = 
  -$shared_extension = 
  +$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
   $ranlib       = 
  -$arflags      = 
  +$arflags      = -X 32
   
   *** aix3-cc
   $cc           = cc
  @@ -833,10 +833,10 @@
   $rc5_obj      = 
   $wp_obj       = 
   $dso_scheme   = dlfcn
  -$shared_target= 
  +$shared_target= aix-shared
   $shared_cflag = 
  -$shared_ldflag = 
  -$shared_extension = 
  +$shared_ldflag = -maix64
  +$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
   $ranlib       = 
   $arflags      = -X64
   
  @@ .
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@openssl.org
Automated List Manager                           majordomo@openssl.org


[prev in list] [next in list] [prev in thread] [next in thread]