comparison: openpkg/rpm.patch.porting
openpkg/rpm.patch.porting
- changeset 228
- 19b611159e28
- parent 13
- cb59d6afeb61
- child 330
- 51aab9414a86
equal
deleted
inserted
replaced
| 0:3155a34312a5 | 1:4879229f7350 |
|---|---|
| 1480 #include <stdio.h> | 1480 #include <stdio.h> |
| 1481 +#endif | 1481 +#endif |
| 1482 #include <ctype.h> | 1482 #include <ctype.h> |
| 1483 | 1483 |
| 1484 /* The code at the top of get_date which figures out the offset of the | 1484 /* The code at the top of get_date which figures out the offset of the |
| 1485 | |
| 1486 +--------------------------------------------------------------------------- | |
| 1487 | The following patch works around a general failure of RPM to | |
| 1488 | adhere to the ISO C standard, for which newer GCC releases claim | |
| 1489 | compile errors and fail. | |
| 1490 +--------------------------------------------------------------------------- | |
| 1491 Index: misc/err.h | |
| 1492 --- misc/err.h 2009-01-06 22:48:16.104430941 +0100 | |
| 1493 +++ misc/err.h 2009-01-06 22:47:55.944312482 +0100 | |
| 1494 @@ -29,31 +29,4 @@ | |
| 1495 # define __gnuc_va_list __ptr_t | |
| 1496 #endif | |
| 1497 | |
| 1498 -__BEGIN_DECLS | |
| 1499 - | |
| 1500 -/* Print "program: ", FORMAT, ": ", the standard error string for errno, | |
| 1501 - and a newline, on stderr. */ | |
| 1502 -extern void warn __P ((__const char *__format, ...)) | |
| 1503 - __attribute__ ((__format__ (__printf__, 1, 2))); | |
| 1504 -extern void vwarn __P ((__const char *__format, __gnuc_va_list)) | |
| 1505 - __attribute__ ((__format__ (__printf__, 1, 0))); | |
| 1506 - | |
| 1507 -/* Likewise, but without ": " and the standard error string. */ | |
| 1508 -extern void warnx __P ((__const char *__format, ...)) | |
| 1509 - __attribute__ ((__format__ (__printf__, 1, 2))); | |
| 1510 -extern void vwarnx __P ((__const char *__format, __gnuc_va_list)) | |
| 1511 - __attribute__ ((__format__ (__printf__, 1, 0))); | |
| 1512 - | |
| 1513 -/* Likewise, and then exit with STATUS. */ | |
| 1514 -extern void err __P ((int __status, __const char *__format, ...)) | |
| 1515 - __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3))); | |
| 1516 -extern void verr __P ((int __status, __const char *__format, __gnuc_va_list)) | |
| 1517 - __attribute__ ((__noreturn__, __format__ (__printf__, 2, 0))); | |
| 1518 -extern void errx __P ((int __status, __const char *__format, ...)) | |
| 1519 - __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3))); | |
| 1520 -extern void verrx __P ((int __status, __const char *, __gnuc_va_list)) | |
| 1521 - __attribute__ ((__noreturn__, __format__ (__printf__, 2, 0))); | |
| 1522 - | |
| 1523 -__END_DECLS | |
| 1524 - | |
| 1525 #endif /* err.h */ | |
| 1526 | |
| 1527 +--------------------------------------------------------------------------- | |
| 1528 | Due to either GCC enforcing ISO C or faulty references in the | |
| 1529 | rpmio component, Solaris 11 fails to build while compiling fts.c. | |
| 1530 | Hack a custom 'dirent.h' as found in /usr/include, remove the | |
| 1531 | line 104 'extern int dirfd(DIR *);' from the header file, and | |
| 1532 | place in directory openpkg-`date +%Y%m%d`/rpm-<version>/rpmio/. | |
| 1533 +--------------------------------------------------------------------------- |
