openpkg/beecrypt.patch@4ecfc2416fd8 (annotated)
openpkg/beecrypt.patch
Tue, 29 Mar 2011 19:46:35 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 29 Mar 2011 19:46:35 +0200
- changeset 333
- 4ecfc2416fd8
- child 428
- f880f219c566
- permissions
- -rw-r--r--
Correct and introduce slightly needed logic, leading to better reliability:
Update bash(1) patch logic, correct several buildconf make location
errors, correct failed bash(1) configure invocation, enable perl(1) to
build with unpathed make(1), patch rpm(1) to correctly link with
internal libdb(3), and lastly unsuscessfully try to reorganize rpm patch
hunks.
| michael@13 | 1 | Index: gas/aesopt.x86.m4 |
| michael@13 | 2 | --- gas/aesopt.x86.m4.orig 2004-06-13 13:37:23 +0200 |
| michael@13 | 3 | +++ gas/aesopt.x86.m4 2004-07-28 20:02:07 +0200 |
| michael@13 | 4 | @@ -134,6 +134,9 @@ |
| michael@13 | 5 | pxor 6144(%esi,%edx,8),s0 |
| michael@13 | 6 | ') |
| michael@13 | 7 | |
| michael@13 | 8 | +') |
| michael@13 | 9 | +ifdef(`USE_MMX',` |
| michael@13 | 10 | + |
| michael@13 | 11 | define(`elr',` |
| michael@13 | 12 | movd 0(%ebp),s0 |
| michael@13 | 13 | movd t0,%eax |
| michael@13 | 14 | @@ -253,6 +256,9 @@ |
| michael@13 | 15 | ') |
| michael@13 | 16 | |
| michael@13 | 17 | |
| michael@13 | 18 | +') |
| michael@13 | 19 | +ifdef(`USE_MMX',` |
| michael@13 | 20 | + |
| michael@13 | 21 | C_FUNCTION_BEGIN(aesEncrypt) |
| michael@13 | 22 | pushl %edi |
| michael@13 | 23 | pushl %esi |
| michael@13 | 24 | @@ -364,6 +370,9 @@ |
| michael@13 | 25 | pxor 6144(%esi,%edx,8),t2 |
| michael@13 | 26 | ') |
| michael@13 | 27 | |
| michael@13 | 28 | +') |
| michael@13 | 29 | +ifdef(`USE_MMX',` |
| michael@13 | 30 | + |
| michael@13 | 31 | define(`dsft',` |
| michael@13 | 32 | movd $1+ 0(%ebp),s0 |
| michael@13 | 33 | movd t0,%eax |
| michael@13 | 34 | @@ -490,6 +499,9 @@ |
| michael@13 | 35 | pxor t3,s2 |
| michael@13 | 36 | ') |
| michael@13 | 37 | |
| michael@13 | 38 | +') |
| michael@13 | 39 | +ifdef(`USE_MMX',` |
| michael@13 | 40 | + |
| michael@13 | 41 | define(`dblock',` |
| michael@13 | 42 | sxrk |
| michael@13 | 43 | |
| michael@13 | 44 | Index: gnu.h.in |
| michael@13 | 45 | --- gnu.h.in.orig 2004-12-19 21:18:48 +0100 |
| michael@13 | 46 | +++ gnu.h.in 2005-03-08 19:34:03 +0100 |
| michael@13 | 47 | @@ -48,15 +48,6 @@ |
| michael@13 | 48 | @TYPEDEF_UINT32_T@ |
| michael@13 | 49 | @TYPEDEF_UINT64_T@ |
| michael@13 | 50 | |
| michael@13 | 51 | -#if defined(__GNUC__) |
| michael@13 | 52 | -# if !defined(__GNUC_PREREQ__) |
| michael@13 | 53 | -# define __GNUC_PREREQ__(maj, min) (__GNUC__ > (maj) || __GNUC__ == (maj) && __GNUC_MINOR__ >= (min)) |
| michael@13 | 54 | -# endif |
| michael@13 | 55 | -#else |
| michael@13 | 56 | -# define __GNUC__ 0 |
| michael@13 | 57 | -# define __GNUC_PREREQ__(maj, min) 0 |
| michael@13 | 58 | -#endif |
| michael@13 | 59 | - |
| michael@13 | 60 | /* WARNING: overriding this value is dangerous; some assembler routines |
| michael@13 | 61 | * make assumptions about the size set by the configure script |
| michael@13 | 62 | */ |
