comparison: openpkg/rpm.patch.porting
openpkg/rpm.patch.porting
- changeset 395
- 41738a0e98d1
- parent 333
- 4ecfc2416fd8
equal
deleted
inserted
replaced
| 3:39ac3a69e92a | 4:4c1939fa689f |
|---|---|
| 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 @@ -964,12 +967,13 @@ | 95 @@ -967,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 @@ -1142,9 +1146,6 @@ | 118 @@ -1146,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 @@ -1250,11 +1251,40 @@ | 140 @@ -1251,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 |
| 1220 | Add support for BSD getmntinfo(3). | 1220 | Add support for BSD getmntinfo(3). |
| 1221 +--------------------------------------------------------------------------- | 1221 +--------------------------------------------------------------------------- |
| 1222 Index: system.h | 1222 Index: system.h |
| 1223 --- system.h 1 Mar 2003 19:53:08 -0000 1.1.1.10 | 1223 --- system.h 1 Mar 2003 19:53:08 -0000 1.1.1.10 |
| 1224 +++ system.h 8 Jun 2005 13:15:16 -0000 1.4 | 1224 +++ system.h 8 Jun 2005 13:15:16 -0000 1.4 |
| 1225 @@ -550,7 +546,7 @@ | 1225 @@ -546,7 +546,7 @@ |
| 1226 #define lchown chown | 1226 #define lchown chown |
| 1227 #endif | 1227 #endif |
| 1228 | 1228 |
| 1229 -#if HAVE_GETMNTINFO_R || HAVE_MNTCTL | 1229 -#if HAVE_GETMNTINFO_R || HAVE_MNTCTL |
| 1230 +#if HAVE_GETMNTINFO_R || HAVE_GETMNTINFO || HAVE_MNTCTL | 1230 +#if HAVE_GETMNTINFO_R || HAVE_GETMNTINFO || HAVE_MNTCTL |
| 1236 | Drop GCC "inline" attribute if not compiling with GCC. | 1236 | Drop GCC "inline" attribute if not compiling with GCC. |
| 1237 +--------------------------------------------------------------------------- | 1237 +--------------------------------------------------------------------------- |
| 1238 Index: system.h | 1238 Index: system.h |
| 1239 --- system.h 1 Mar 2003 19:53:08 -0000 1.1.1.10 | 1239 --- system.h 1 Mar 2003 19:53:08 -0000 1.1.1.10 |
| 1240 +++ system.h 8 Jun 2005 13:15:16 -0000 1.4 | 1240 +++ system.h 8 Jun 2005 13:15:16 -0000 1.4 |
| 1241 @@ -603,11 +599,24 @@ | 1241 @@ -599,11 +599,24 @@ |
| 1242 | 1242 |
| 1243 #if defined(__LCLINT__) | 1243 #if defined(__LCLINT__) |
| 1244 #define FILE_RCSID(id) | 1244 #define FILE_RCSID(id) |
| 1245 -#else | 1245 -#else |
| 1246 +#elif defined(__GNUC__) | 1246 +#elif defined(__GNUC__) |
