aqmoney/aqmoney.patch@4ecfc2416fd8 (annotated)
aqmoney/aqmoney.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
- 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@22 | 1 | Index: src/Makefile.in |
| michael@22 | 2 | --- src/Makefile.in.orig 2004-05-27 23:29:46 +0200 |
| michael@22 | 3 | +++ src/Makefile.in 2005-04-21 21:58:27 +0200 |
| michael@22 | 4 | @@ -197,7 +197,7 @@ |
| michael@22 | 5 | |
| michael@22 | 6 | |
| michael@22 | 7 | aqmoney2_LDADD = \ |
| michael@22 | 8 | - @PROGRAM_LIBS@ modules/libmodules.la libaqmoney/libaqmoney.la |
| michael@22 | 9 | + modules/libmodules.la libaqmoney/libaqmoney.la @PROGRAM_LIBS@ |
| michael@22 | 10 | |
| michael@22 | 11 | aqmoney2_SOURCES = \ |
| michael@22 | 12 | aqmauth.cpp \ |
| michael@22 | 13 | @@ -206,7 +206,7 @@ |
| michael@22 | 14 | |
| michael@22 | 15 | |
| michael@22 | 16 | qtest_LDADD = \ |
| michael@22 | 17 | - @PROGRAM_LIBS@ modules/libmodules.la libaqmoney/libaqmoney.la |
| michael@22 | 18 | + modules/libmodules.la libaqmoney/libaqmoney.la @PROGRAM_LIBS@ |
| michael@22 | 19 | |
| michael@22 | 20 | |
| michael@22 | 21 | qtest_SOURCES = qtest.cpp |
| michael@22 | 22 | Index: src/libaqmoney/converter/oldconf.c |
| michael@22 | 23 | --- src/libaqmoney/converter/oldconf.c.orig 2004-01-25 19:51:29 +0100 |
| michael@22 | 24 | +++ src/libaqmoney/converter/oldconf.c 2005-04-21 21:34:14 +0200 |
| michael@22 | 25 | @@ -642,7 +642,7 @@ |
| michael@22 | 26 | assert(root); |
| michael@22 | 27 | assert(path); |
| michael@22 | 28 | DBG_VERBOUS(0, "GetValue for \"%s\"",path); |
| michael@22 | 29 | - var=ConfigOld__GetPath(root,path, |
| michael@22 | 30 | + var=(CONFIGOLDVARIABLE *)ConfigOld__GetPath(root,path, |
| michael@22 | 31 | CONFIGOLDMODE_PATHMUSTEXIST | |
| michael@22 | 32 | CONFIGOLDMODE_NAMEMUSTEXIST | |
| michael@22 | 33 | CONFIGOLDMODE_VARIABLE); |
| michael@22 | 34 | @@ -945,7 +945,7 @@ |
| michael@22 | 35 | } |
| michael@22 | 36 | *p=0; |
| michael@22 | 37 | DBG_VERBOUS(0, "Selecting group \"%s\"",name); |
| michael@22 | 38 | - grp=ConfigOld__GetPath(root, name, mode &~CONFIGOLDMODE_VARIABLE); |
| michael@22 | 39 | + grp=(CONFIGOLDGROUP *)ConfigOld__GetPath(root, name, mode &~CONFIGOLDMODE_VARIABLE); |
| michael@22 | 40 | if (!grp) { |
| michael@22 | 41 | DBG_DEBUG(0, "Group \"%s\" is not available",name); |
| michael@22 | 42 | return 0; |
| michael@22 | 43 | @@ -1017,7 +1017,7 @@ |
| michael@22 | 44 | |
| michael@22 | 45 | DBG_VERBOUS(0, "Creating variable \"%s\"",np); |
| michael@22 | 46 | if (mode & CONFIGOLDMODE_ALLOW_PATH_IN_VARS) |
| michael@22 | 47 | - var=ConfigOld__GetPath(group, |
| michael@22 | 48 | + var=(CONFIGOLDVARIABLE *)ConfigOld__GetPath(group, |
| michael@22 | 49 | np, |
| michael@22 | 50 | mode|CONFIGOLDMODE_VARIABLE); |
| michael@22 | 51 | else { |
| michael@22 | 52 | Index: configure |
| michael@22 | 53 | --- configure.orig 2004-05-27 23:29:51 +0200 |
| michael@22 | 54 | +++ configure 2005-04-22 11:16:30 +0200 |
| michael@22 | 55 | @@ -21333,7 +21333,7 @@ |
| michael@22 | 56 | |
| michael@22 | 57 | if test -n "$found_file" ; then |
| michael@22 | 58 | ktoblzcheck_libraries="-L$d" |
| michael@22 | 59 | - ktoblzcheck_lib="-l`echo $found_file | sed 's/lib//;s/\.so*//;s/\.a//'`" |
| michael@22 | 60 | + ktoblzcheck_lib="-l`echo $found_file | sed 's/lib//;s/\.so*//;s/\.a//;s/\\.la//'`" |
| michael@22 | 61 | break |
| michael@22 | 62 | fi |
| michael@22 | 63 | done |
