Author: pebender
Date: Thu Mar 26 20:24:00 2009
New Revision: 4519
Added:
trunk/gar-minimyth/script/lib/openssl/files/openssl-0.9.8k.patch.gar
Removed:
trunk/gar-minimyth/script/lib/openssl/files/openssl-0.9.8j.patch.gar
Log:
- Added file update missing from previous commit.
Added: trunk/gar-minimyth/script/lib/openssl/files/openssl-0.9.8k.patch.gar
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/lib/openssl/files/openssl-0.9.8k.patch.gar
Thu Mar 26 20:24:00 2009
@@ -0,0 +1,113 @@
+diff -Naur openssl-0.9.8k-old/Configure openssl-0.9.8k-new/Configure
+--- openssl-0.9.8k-old/Configure 2009-02-16 00:44:22.000000000 -0800
++++ openssl-0.9.8k-new/Configure 2009-03-26 18:34:25.000000000 -0700
+@@ -329,7 +329,7 @@
+ "linux-ppc", "gcc:-DB_ENDIAN -DTERMIO -O3
-Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1
DES_UNROLL::linux_ppc32.o::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ #### IA-32 targets...
+ "linux-ia32-icc", "icc:-DL_ENDIAN -DTERMIO -O2
-no_cpprt::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer
-Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-elf", "@GAR_CC@:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall
@GAR_CFLAGS@::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:@GAR_LDFLAGS@
-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer
-march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:${x86_out_asm}",
+ ####
+ "linux-generic64","gcc:-DTERMIO -O3
-Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT
DES_UNROLL
BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+@@ -337,7 +337,7 @@
+ "linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3
-Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG
RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall
-no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG
RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall
-no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG
RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall
-DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2
DES_INT
DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-x86_64", "@GAR_CC@:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall
-DMD32_REG_T=int @GAR_CFLAGS@::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG
RC4_CHUNK BF_PTR2 DES_INT
DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:@GAR_LDFLAGS@
-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ #### SPARC Linux setups
+ # Ray Miller <[email protected]> has patiently
+ # assisted with debugging of following two configs.
+@@ -1468,7 +1468,7 @@
+ s/^OPTIONS=.*$/OPTIONS=$options/;
+ s/^CONFIGURE_ARGS=.*$/CONFIGURE_ARGS=$argvstring/;
+ s/^CC=.*$/CC= $cc/;
+- s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
++ s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "@GAR_CC@";
+ s/^CFLAG=.*$/CFLAG= $cflags/;
+ s/^DEPFLAG=.*$/DEPFLAG=$depflags/;
+ s/^PEX_LIBS=.*$/PEX_LIBS= $prelflags/;
+diff -Naur openssl-0.9.8k-old/Makefile openssl-0.9.8k-new/Makefile
+--- openssl-0.9.8k-old/Makefile 2009-03-25 06:11:43.000000000 -0700
++++ openssl-0.9.8k-new/Makefile 2009-03-26 18:34:25.000000000 -0700
+@@ -59,20 +59,20 @@
+ # equal 4.
+ # PKCS1_CHECK - pkcs1 tests.
+
+-CC= cc
++CC= @GAR_CC@
+ CFLAG= -O
+ DEPFLAG= -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_CMS
-DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5
-DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SEED
+ PEX_LIBS=
+ EX_LIBS=
+ EXE_EXT=
+ ARFLAGS=
+-AR=ar $(ARFLAGS) r
+-ARD=ar $(ARFLAGS) d
+-RANLIB= /usr/bin/ranlib
+-PERL= /usr/bin/perl
++...@gar_ar@ $(ARFLAGS) r
++a...@gar_ar@ $(ARFLAGS) d
++RANLIB= @GAR_RANLIB@
++PERL= perl
+ TAR= tar
+ TARFLAGS= --no-recursion
+-MAKEDEPPROG=makedepend
++makedeppr...@gar_cc@
+
+ # We let the C compiler driver to take care of .s files. This is done in
+ # order to be excused from maintaining a separate set of architecture
+diff -Naur openssl-0.9.8k-old/Makefile.org openssl-0.9.8k-new/Makefile.org
+--- openssl-0.9.8k-old/Makefile.org 2009-03-03 14:40:29.000000000 -0800
++++ openssl-0.9.8k-new/Makefile.org 2009-03-26 18:34:25.000000000 -0700
+@@ -57,20 +57,20 @@
+ # equal 4.
+ # PKCS1_CHECK - pkcs1 tests.
+
+-CC= cc
++CC= @GAR_CC@
+ CFLAG= -O
+ DEPFLAG=
+ PEX_LIBS=
+ EX_LIBS=
+ EXE_EXT=
+ ARFLAGS=
+-AR=ar $(ARFLAGS) r
+-ARD=ar $(ARFLAGS) d
+-RANLIB= ranlib
++...@gar_ar@ $(ARFLAGS) r
++a...@gar_ar@ $(ARFLAGS) d
++RANLIB= @GAR_RANLIB@
+ PERL= perl
+ TAR= tar
+ TARFLAGS= --no-recursion
+-MAKEDEPPROG=makedepend
++makedeppr...@gar_cc@
+
+ # We let the C compiler driver to take care of .s files. This is done in
+ # order to be excused from maintaining a separate set of architecture
+diff -Naur openssl-0.9.8k-old/Makefile.shared
openssl-0.9.8k-new/Makefile.shared
+--- openssl-0.9.8k-old/Makefile.shared 2008-09-17 08:56:40.000000000 -0700
++++ openssl-0.9.8k-new/Makefile.shared 2009-03-26 18:34:25.000000000 -0700
+@@ -6,7 +6,7 @@
+ # properly
+
+ # CC contains the current compiler. This one MUST be defined
+-CC=cc
++...@gar_cc@
+ CFLAGS=$(CFLAG)
+ # LDFLAGS contains flags to be used when temporary object files (when
building
+ # shared libraries) are created, or when an application is linked.
+diff -Naur openssl-0.9.8k-old/util/domd openssl-0.9.8k-new/util/domd
+--- openssl-0.9.8k-old/util/domd 2009-01-21 13:44:52.000000000 -0800
++++ openssl-0.9.8k-new/util/domd 2009-03-26 18:34:25.000000000 -0700
+@@ -14,7 +14,7 @@
+ cp Makefile Makefile.save
+ # fake the presence of Kerberos
+ touch $TOP/krb5.h
+-if [ "$MAKEDEPEND" = "gcc" ]; then
++if [ "$MAKEDEPEND" = "@GAR_CC@" ]; then
+ args=""
+ while [ $# -gt 0 ]; do
+ if [ "$1" != "--" ]; then args="$args $1"; fi
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
