comparison: openpkg/rpm.patch.porting
openpkg/rpm.patch.porting
- changeset 333
- 4ecfc2416fd8
- parent 330
- 51aab9414a86
- child 336
- fa72b60f59c9
equal
deleted
inserted
replaced
| 2:6541b1e31fc7 | 3:39ac3a69e92a |
|---|---|
| 35 | Disable special RedHat NPTL handling. | 35 | Disable special RedHat NPTL handling. |
| 36 +--------------------------------------------------------------------------- | 36 +--------------------------------------------------------------------------- |
| 37 Index: configure.ac | 37 Index: configure.ac |
| 38 --- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4 | 38 --- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4 |
| 39 +++ configure.ac 13 Sep 2006 13:40:20 -0000 | 39 +++ configure.ac 13 Sep 2006 13:40:20 -0000 |
| 40 @@ -150,10 +151,10 @@ | 40 @@ -151,10 +151,10 @@ |
| 41 dnl XXX Test for libpthread.a that is NPTL aware (static link only). | 41 dnl XXX Test for libpthread.a that is NPTL aware (static link only). |
| 42 dnl | 42 dnl |
| 43 LDFLAGS_NPTL= | 43 LDFLAGS_NPTL= |
| 44 -if test -f /usr/lib/nptl/libpthread.a ; then | 44 -if test -f /usr/lib/nptl/libpthread.a ; then |
| 45 - LDFLAGS_NPTL="-L/usr/lib/nptl" | 45 - LDFLAGS_NPTL="-L/usr/lib/nptl" |
| 58 | non-Pthread mutexes in Berkeley-DB. | 58 | non-Pthread mutexes in Berkeley-DB. |
| 59 +--------------------------------------------------------------------------- | 59 +--------------------------------------------------------------------------- |
| 60 Index: configure.ac | 60 Index: configure.ac |
| 61 --- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4 | 61 --- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4 |
| 62 +++ configure.ac 13 Sep 2006 13:40:21 -0000 | 62 +++ configure.ac 13 Sep 2006 13:40:21 -0000 |
| 63 @@ -446,14 +447,17 @@ | 63 @@ -447,14 +447,17 @@ |
| 64 AC_CHECK_LIB(socket, socket) | 64 AC_CHECK_LIB(socket, socket) |
| 65 ]) | 65 ]) |
| 66 | 66 |
| 67 -AC_CHECK_HEADERS(thread.h pthread.h synch.h semaphore.h) | 67 -AC_CHECK_HEADERS(thread.h pthread.h synch.h semaphore.h) |
| 68 +dnl # required for HP-UX because of RPC stuff in DB | 68 +dnl # required for HP-UX because of RPC stuff in DB |
| 90 | Add support for BSD getmntinfo(3). | 90 | Add support for BSD getmntinfo(3). |
| 91 +--------------------------------------------------------------------------- | 91 +--------------------------------------------------------------------------- |
| 92 Index: configure.ac | 92 Index: configure.ac |
| 93 --- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4 | 93 --- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4 |
| 94 +++ configure.ac 13 Sep 2006 13:40:23 -0000 | 94 +++ configure.ac 13 Sep 2006 13:40:23 -0000 |
| 95 @@ -963,12 +967,13 @@ | 95 @@ -964,12 +967,13 @@ |
| 96 AC_CHECK_FUNCS(getpassphrase) | 96 AC_CHECK_FUNCS(getpassphrase) |
| 97 | 97 |
| 98 AC_CHECK_FUNC(getmntent, AC_DEFINE(HAVE_GETMNTENT, 1, [Define if you have the getmntent() function]), [ | 98 AC_CHECK_FUNC(getmntent, AC_DEFINE(HAVE_GETMNTENT, 1, [Define if you have the getmntent() function]), [ |
| 99 + AC_CHECK_FUNC(getmntinfo, AC_DEFINE(HAVE_GETMNTINFO, 1, [Define as 1 if you have the getmntinfo() function]), [ | 99 + AC_CHECK_FUNC(getmntinfo, AC_DEFINE(HAVE_GETMNTINFO, 1, [Define as 1 if you have the getmntinfo() function]), [ |
| 100 AC_CHECK_FUNC(mntctl, AC_DEFINE(HAVE_MNTCTL, 1, [Define as 1 if you have mntctl() (only aix?)]),[ | 100 AC_CHECK_FUNC(mntctl, AC_DEFINE(HAVE_MNTCTL, 1, [Define as 1 if you have mntctl() (only aix?)]),[ |
| 113 | into any system locations at all. | 113 | into any system locations at all. |
| 114 +--------------------------------------------------------------------------- | 114 +--------------------------------------------------------------------------- |
| 115 Index: configure.ac | 115 Index: configure.ac |
| 116 --- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4 | 116 --- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4 |
| 117 +++ configure.ac 13 Sep 2006 13:40:25 -0000 | 117 +++ configure.ac 13 Sep 2006 13:40:25 -0000 |
| 118 @@ -1141,9 +1146,6 @@ | 118 @@ -1142,9 +1146,6 @@ |
| 119 | 119 |
| 120 dnl XXX Choose /usr/lib or /usr/lib64 for library installs. | 120 dnl XXX Choose /usr/lib or /usr/lib64 for library installs. |
| 121 MARK64= | 121 MARK64= |
| 122 -case "${target_cpu}" in | 122 -case "${target_cpu}" in |
| 123 -x86_64*|ppc64*|powerpc64*|sparc64*|s390x*) MARK64=64 ;; | 123 -x86_64*|ppc64*|powerpc64*|sparc64*|s390x*) MARK64=64 ;; |
| 135 | beecrypt subdirectory. | 135 | beecrypt subdirectory. |
| 136 +--------------------------------------------------------------------------- | 136 +--------------------------------------------------------------------------- |
| 137 Index: configure.ac | 137 Index: configure.ac |
| 138 --- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4 | 138 --- configure.ac 2 Jul 2003 19:20:52 -0000 1.1.1.4 |
| 139 +++ configure.ac 13 Sep 2006 13:40:29 -0000 | 139 +++ configure.ac 13 Sep 2006 13:40:29 -0000 |
| 140 @@ -1249,11 +1251,40 @@ | 140 @@ -1250,11 +1251,40 @@ |
| 141 | 141 |
| 142 AC_SUBST(OBJDUMP) | 142 AC_SUBST(OBJDUMP) |
| 143 | 143 |
| 144 +dnl OpenPKG: rpmfile.h (used in RPM) from file(1) needs additional checks | 144 +dnl OpenPKG: rpmfile.h (used in RPM) from file(1) needs additional checks |
| 145 +dnl for its use of uintXX_t (which are available in file/config.h, but which | 145 +dnl for its use of uintXX_t (which are available in file/config.h, but which |
| 1535 - __attribute__ ((__noreturn__, __format__ (__printf__, 2, 0))); | 1535 - __attribute__ ((__noreturn__, __format__ (__printf__, 2, 0))); |
| 1536 - | 1536 - |
| 1537 -__END_DECLS | 1537 -__END_DECLS |
| 1538 - | 1538 - |
| 1539 #endif /* err.h */ | 1539 #endif /* err.h */ |
| 1540 |
