OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Oct-2007 10:03:19
Branch: HEAD Handle: 2007101709031600
Modified files:
openpkg-src/openpkg openssl.patch
Log:
fix patching
Summary:
Revision Changes Path
1.11 +11 -14 openpkg-src/openpkg/openssl.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openssl.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 openssl.patch
--- openpkg-src/openpkg/openssl.patch 17 Oct 2007 07:01:34 -0000 1.10
+++ openpkg-src/openpkg/openssl.patch 17 Oct 2007 08:03:16 -0000 1.11
@@ -68,6 +68,17 @@
elsif (/^reconfigure/ || /^reconf/)
{
if (open(IN,"<$Makefile"))
+@@ -402,8 +402,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::::::::::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::::::::::dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",
++"aix-gcc", "gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::BN_LLONG
RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
++"aix64-gcc","gcc:-maix64 -O
-DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG
RC4_CHAR::aix_ppc64.o::::::::::dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
+ # 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::::::::::dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X
32",
@@ -948,7 +954,7 @@
print "IsMK1MF=$IsMK1MF\n";
@@ -77,20 +88,6 @@
my $cflags = $fields[$idx_cflags];
my $unistd = $fields[$idx_unistd];
my $thread_cflag = $fields[$idx_thread_cflag];
-Index: Configure
---- Configure.orig 2007-10-17 08:55:51 +0200
-+++ Configure 2007-10-17 08:56:05 +0200
-@@ -402,8 +402,8 @@
-
- #### IBM's AIX.
- "aix3-cc", "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::RC4_CHAR:::",
--"aix-gcc", "gcc:-O
-DB_ENDIAN::-D_THREAD_SAFE:AIX::RC4_CHAR::aix_ppc32.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::::::::::dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",
-+"aix-gcc", "gcc:-O
-DB_ENDIAN::-D_THREAD_SAFE:AIX::RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
-+"aix64-gcc","gcc:-maix64 -O
-DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG
RC4_CHAR::aix_ppc64.o::::::::::dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
- # 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::RC4_CHAR::aix_ppc32.o::::::::::dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X
32",
Index: config
--- config.orig 2007-08-01 13:21:35 +0200
+++ config 2007-10-11 22:45:07 +0200
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
