fixing multiarch conflict
This commit is contained in:
Marek Mahut
parent
c8cea656f5
commit
c37ed855ef
9
config.h
Normal file
9
config.h
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
#include <bits/wordsize.h>
|
||||||
|
|
||||||
|
#if __WORDSIZE == 32
|
||||||
|
#include "config-32.h"
|
||||||
|
#elif __WORDSIZE == 64
|
||||||
|
#include "config-64.h"
|
||||||
|
#else
|
||||||
|
#error "Unknown word size"
|
||||||
|
#endif
|
||||||
467
irssi-0.8.12-multiarch.patch
Normal file
467
irssi-0.8.12-multiarch.patch
Normal file
@ -0,0 +1,467 @@
|
|||||||
|
diff -Naur irssi-0.8.12-upstream/config-32.h irssi-0.8.12/config-32.h
|
||||||
|
--- irssi-0.8.12-upstream/config-32.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ irssi-0.8.12/config-32.h 2008-03-01 16:33:57.000000000 +0100
|
||||||
|
@@ -0,0 +1,149 @@
|
||||||
|
+/* config.h. Generated from config.h.in by configure. */
|
||||||
|
+/* config.h.in. Generated from configure.in by autoheader. */
|
||||||
|
+/* misc.. */
|
||||||
|
+#define HAVE_IPV6 1
|
||||||
|
+/* #undef HAVE_SOCKS_H */
|
||||||
|
+#define HAVE_PL_PERL 1
|
||||||
|
+#define HAVE_STATIC_PERL 1
|
||||||
|
+#define HAVE_GMODULE 1
|
||||||
|
+/* #undef HAVE_GC_H */
|
||||||
|
+/* #undef HAVE_GC_GC_H */
|
||||||
|
+/* #undef USE_GC */
|
||||||
|
+/* #undef HAVE_GLIB2 */
|
||||||
|
+
|
||||||
|
+/* macros/curses checks */
|
||||||
|
+#define HAS_CURSES 1
|
||||||
|
+/* #undef USE_SUNOS_CURSES */
|
||||||
|
+/* #undef USE_BSD_CURSES */
|
||||||
|
+/* #undef USE_SYSV_CURSES */
|
||||||
|
+#define USE_NCURSES 1
|
||||||
|
+/* #undef NO_COLOR_CURSES */
|
||||||
|
+/* #undef SCO_FLAVOR */
|
||||||
|
+
|
||||||
|
+/* our own curses checks */
|
||||||
|
+/* #undef HAVE_NCURSES_USE_DEFAULT_COLORS */
|
||||||
|
+/* #undef HAVE_CURSES_IDCOK */
|
||||||
|
+/* #undef HAVE_CURSES_RESIZETERM */
|
||||||
|
+/* #undef HAVE_CURSES_WRESIZE */
|
||||||
|
+
|
||||||
|
+/* terminfo/termcap */
|
||||||
|
+#define HAVE_TERMINFO 1
|
||||||
|
+
|
||||||
|
+/* If set to 64, enables 64bit off_t for some systems (eg. Linux, Solaris) */
|
||||||
|
+#define _FILE_OFFSET_BITS 64
|
||||||
|
+
|
||||||
|
+/* What type should be used for uoff_t */
|
||||||
|
+/* #undef UOFF_T_INT */
|
||||||
|
+/* #undef UOFF_T_LONG */
|
||||||
|
+#define UOFF_T_LONG_LONG 1
|
||||||
|
+
|
||||||
|
+/* printf()-format for uoff_t, eg. "u" or "lu" or "llu" */
|
||||||
|
+#define PRIuUOFF_T "llu"
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <dirent.h> header file. */
|
||||||
|
+#define HAVE_DIRENT_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <dlfcn.h> header file. */
|
||||||
|
+#define HAVE_DLFCN_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the `fcntl' function. */
|
||||||
|
+#define HAVE_FCNTL 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <inttypes.h> header file. */
|
||||||
|
+#define HAVE_INTTYPES_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <memory.h> header file. */
|
||||||
|
+#define HAVE_MEMORY_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the `mkfifo' function. */
|
||||||
|
+#define HAVE_MKFIFO 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the `nl_langinfo' function. */
|
||||||
|
+#define HAVE_NL_LANGINFO 1
|
||||||
|
+
|
||||||
|
+/* Build with OpenSSL support */
|
||||||
|
+#define HAVE_OPENSSL
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <openssl/err.h> header file. */
|
||||||
|
+/* #undef HAVE_OPENSSL_ERR_H */
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <openssl/ssl.h> header file. */
|
||||||
|
+/* #undef HAVE_OPENSSL_SSL_H */
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <regex.h> header file. */
|
||||||
|
+#define HAVE_REGEX_H 1
|
||||||
|
+
|
||||||
|
+/* Build with socks support */
|
||||||
|
+/* #undef HAVE_SOCKS */
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <stdint.h> header file. */
|
||||||
|
+#define HAVE_STDINT_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <stdlib.h> header file. */
|
||||||
|
+#define HAVE_STDLIB_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <strings.h> header file. */
|
||||||
|
+#define HAVE_STRINGS_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <string.h> header file. */
|
||||||
|
+#define HAVE_STRING_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
|
||||||
|
+#define HAVE_SYS_IOCTL_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <sys/resource.h> header file. */
|
||||||
|
+#define HAVE_SYS_RESOURCE_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <sys/stat.h> header file. */
|
||||||
|
+#define HAVE_SYS_STAT_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <sys/time.h> header file. */
|
||||||
|
+#define HAVE_SYS_TIME_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <sys/types.h> header file. */
|
||||||
|
+#define HAVE_SYS_TYPES_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <sys/utsname.h> header file. */
|
||||||
|
+#define HAVE_SYS_UTSNAME_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <unistd.h> header file. */
|
||||||
|
+#define HAVE_UNISTD_H 1
|
||||||
|
+
|
||||||
|
+/* Define to the address where bug reports for this package should be sent. */
|
||||||
|
+#define PACKAGE_BUGREPORT ""
|
||||||
|
+
|
||||||
|
+/* Define to the full name of this package. */
|
||||||
|
+#define PACKAGE_NAME "irssi"
|
||||||
|
+
|
||||||
|
+/* Define to the full name and version of this package. */
|
||||||
|
+#define PACKAGE_STRING "irssi 0.8.12"
|
||||||
|
+
|
||||||
|
+/* Define to the one symbol short name of this package. */
|
||||||
|
+#define PACKAGE_TARNAME "irssi"
|
||||||
|
+
|
||||||
|
+/* Define to the version of this package. */
|
||||||
|
+#define PACKAGE_VERSION "0.8.12"
|
||||||
|
+
|
||||||
|
+/* The size of `int', as computed by sizeof. */
|
||||||
|
+#define SIZEOF_INT 4
|
||||||
|
+
|
||||||
|
+/* The size of `long', as computed by sizeof. */
|
||||||
|
+#define SIZEOF_LONG 4
|
||||||
|
+
|
||||||
|
+/* The size of `long long', as computed by sizeof. */
|
||||||
|
+#define SIZEOF_LONG_LONG 8
|
||||||
|
+
|
||||||
|
+/* The size of `off_t', as computed by sizeof. */
|
||||||
|
+#define SIZEOF_OFF_T 8
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the ANSI C header files. */
|
||||||
|
+#define STDC_HEADERS 1
|
||||||
|
+
|
||||||
|
+/* Number of bits in a file offset, on hosts where this is settable. */
|
||||||
|
+#define _FILE_OFFSET_BITS 64
|
||||||
|
+
|
||||||
|
+/* Define for large files, on AIX-style hosts. */
|
||||||
|
+/* #undef _LARGE_FILES */
|
||||||
|
+
|
||||||
|
+/* Define to 'int' if <sys/socket.h> doesn't define. */
|
||||||
|
+/* #undef socklen_t */
|
||||||
|
diff -Naur irssi-0.8.12-upstream/config-64.h irssi-0.8.12/config-64.h
|
||||||
|
--- irssi-0.8.12-upstream/config-64.h 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ irssi-0.8.12/config-64.h 2008-03-01 16:34:03.000000000 +0100
|
||||||
|
@@ -0,0 +1,149 @@
|
||||||
|
+/* config.h. Generated from config.h.in by configure. */
|
||||||
|
+/* config.h.in. Generated from configure.in by autoheader. */
|
||||||
|
+/* misc.. */
|
||||||
|
+#define HAVE_IPV6 1
|
||||||
|
+/* #undef HAVE_SOCKS_H */
|
||||||
|
+#define HAVE_PL_PERL 1
|
||||||
|
+#define HAVE_STATIC_PERL 1
|
||||||
|
+#define HAVE_GMODULE 1
|
||||||
|
+/* #undef HAVE_GC_H */
|
||||||
|
+/* #undef HAVE_GC_GC_H */
|
||||||
|
+/* #undef USE_GC */
|
||||||
|
+/* #undef HAVE_GLIB2 */
|
||||||
|
+
|
||||||
|
+/* macros/curses checks */
|
||||||
|
+#define HAS_CURSES 1
|
||||||
|
+/* #undef USE_SUNOS_CURSES */
|
||||||
|
+/* #undef USE_BSD_CURSES */
|
||||||
|
+/* #undef USE_SYSV_CURSES */
|
||||||
|
+#define USE_NCURSES 1
|
||||||
|
+/* #undef NO_COLOR_CURSES */
|
||||||
|
+/* #undef SCO_FLAVOR */
|
||||||
|
+
|
||||||
|
+/* our own curses checks */
|
||||||
|
+/* #undef HAVE_NCURSES_USE_DEFAULT_COLORS */
|
||||||
|
+/* #undef HAVE_CURSES_IDCOK */
|
||||||
|
+/* #undef HAVE_CURSES_RESIZETERM */
|
||||||
|
+/* #undef HAVE_CURSES_WRESIZE */
|
||||||
|
+
|
||||||
|
+/* terminfo/termcap */
|
||||||
|
+#define HAVE_TERMINFO 1
|
||||||
|
+
|
||||||
|
+/* If set to 64, enables 64bit off_t for some systems (eg. Linux, Solaris) */
|
||||||
|
+#define _FILE_OFFSET_BITS 64
|
||||||
|
+
|
||||||
|
+/* What type should be used for uoff_t */
|
||||||
|
+/* #undef UOFF_T_INT */
|
||||||
|
+/* #undef UOFF_T_LONG */
|
||||||
|
+#define UOFF_T_LONG_LONG 1
|
||||||
|
+
|
||||||
|
+/* printf()-format for uoff_t, eg. "u" or "lu" or "llu" */
|
||||||
|
+#define PRIuUOFF_T "llu"
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <dirent.h> header file. */
|
||||||
|
+#define HAVE_DIRENT_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <dlfcn.h> header file. */
|
||||||
|
+#define HAVE_DLFCN_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the `fcntl' function. */
|
||||||
|
+#define HAVE_FCNTL 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <inttypes.h> header file. */
|
||||||
|
+#define HAVE_INTTYPES_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <memory.h> header file. */
|
||||||
|
+#define HAVE_MEMORY_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the `mkfifo' function. */
|
||||||
|
+#define HAVE_MKFIFO 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the `nl_langinfo' function. */
|
||||||
|
+#define HAVE_NL_LANGINFO 1
|
||||||
|
+
|
||||||
|
+/* Build with OpenSSL support */
|
||||||
|
+#define HAVE_OPENSSL
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <openssl/err.h> header file. */
|
||||||
|
+/* #undef HAVE_OPENSSL_ERR_H */
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <openssl/ssl.h> header file. */
|
||||||
|
+/* #undef HAVE_OPENSSL_SSL_H */
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <regex.h> header file. */
|
||||||
|
+#define HAVE_REGEX_H 1
|
||||||
|
+
|
||||||
|
+/* Build with socks support */
|
||||||
|
+/* #undef HAVE_SOCKS */
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <stdint.h> header file. */
|
||||||
|
+#define HAVE_STDINT_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <stdlib.h> header file. */
|
||||||
|
+#define HAVE_STDLIB_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <strings.h> header file. */
|
||||||
|
+#define HAVE_STRINGS_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <string.h> header file. */
|
||||||
|
+#define HAVE_STRING_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
|
||||||
|
+#define HAVE_SYS_IOCTL_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <sys/resource.h> header file. */
|
||||||
|
+#define HAVE_SYS_RESOURCE_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <sys/stat.h> header file. */
|
||||||
|
+#define HAVE_SYS_STAT_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <sys/time.h> header file. */
|
||||||
|
+#define HAVE_SYS_TIME_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <sys/types.h> header file. */
|
||||||
|
+#define HAVE_SYS_TYPES_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <sys/utsname.h> header file. */
|
||||||
|
+#define HAVE_SYS_UTSNAME_H 1
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the <unistd.h> header file. */
|
||||||
|
+#define HAVE_UNISTD_H 1
|
||||||
|
+
|
||||||
|
+/* Define to the address where bug reports for this package should be sent. */
|
||||||
|
+#define PACKAGE_BUGREPORT ""
|
||||||
|
+
|
||||||
|
+/* Define to the full name of this package. */
|
||||||
|
+#define PACKAGE_NAME "irssi"
|
||||||
|
+
|
||||||
|
+/* Define to the full name and version of this package. */
|
||||||
|
+#define PACKAGE_STRING "irssi 0.8.12"
|
||||||
|
+
|
||||||
|
+/* Define to the one symbol short name of this package. */
|
||||||
|
+#define PACKAGE_TARNAME "irssi"
|
||||||
|
+
|
||||||
|
+/* Define to the version of this package. */
|
||||||
|
+#define PACKAGE_VERSION "0.8.12"
|
||||||
|
+
|
||||||
|
+/* The size of `int', as computed by sizeof. */
|
||||||
|
+#define SIZEOF_INT 4
|
||||||
|
+
|
||||||
|
+/* The size of `long', as computed by sizeof. */
|
||||||
|
+#define SIZEOF_LONG 4
|
||||||
|
+
|
||||||
|
+/* The size of `long long', as computed by sizeof. */
|
||||||
|
+#define SIZEOF_LONG_LONG 8
|
||||||
|
+
|
||||||
|
+/* The size of `off_t', as computed by sizeof. */
|
||||||
|
+#define SIZEOF_OFF_T 8
|
||||||
|
+
|
||||||
|
+/* Define to 1 if you have the ANSI C header files. */
|
||||||
|
+#define STDC_HEADERS 1
|
||||||
|
+
|
||||||
|
+/* Number of bits in a file offset, on hosts where this is settable. */
|
||||||
|
+#define _FILE_OFFSET_BITS 64
|
||||||
|
+
|
||||||
|
+/* Define for large files, on AIX-style hosts. */
|
||||||
|
+/* #undef _LARGE_FILES */
|
||||||
|
+
|
||||||
|
+/* Define to 'int' if <sys/socket.h> doesn't define. */
|
||||||
|
+/* #undef socklen_t */
|
||||||
|
diff -Naur irssi-0.8.12-upstream/config.h irssi-0.8.12/config.h
|
||||||
|
--- irssi-0.8.12-upstream/config.h 2008-03-01 16:32:53.000000000 +0100
|
||||||
|
+++ irssi-0.8.12/config.h 2008-03-01 16:34:32.000000000 +0100
|
||||||
|
@@ -1,149 +1,9 @@
|
||||||
|
-/* config.h. Generated from config.h.in by configure. */
|
||||||
|
-/* config.h.in. Generated from configure.in by autoheader. */
|
||||||
|
-/* misc.. */
|
||||||
|
-#define HAVE_IPV6 1
|
||||||
|
-/* #undef HAVE_SOCKS_H */
|
||||||
|
-#define HAVE_PL_PERL 1
|
||||||
|
-#define HAVE_STATIC_PERL 1
|
||||||
|
-#define HAVE_GMODULE 1
|
||||||
|
-/* #undef HAVE_GC_H */
|
||||||
|
-/* #undef HAVE_GC_GC_H */
|
||||||
|
-/* #undef USE_GC */
|
||||||
|
-/* #undef HAVE_GLIB2 */
|
||||||
|
+#include <bits/wordsize.h>
|
||||||
|
|
||||||
|
-/* macros/curses checks */
|
||||||
|
-#define HAS_CURSES 1
|
||||||
|
-/* #undef USE_SUNOS_CURSES */
|
||||||
|
-/* #undef USE_BSD_CURSES */
|
||||||
|
-/* #undef USE_SYSV_CURSES */
|
||||||
|
-#define USE_NCURSES 1
|
||||||
|
-/* #undef NO_COLOR_CURSES */
|
||||||
|
-/* #undef SCO_FLAVOR */
|
||||||
|
-
|
||||||
|
-/* our own curses checks */
|
||||||
|
-/* #undef HAVE_NCURSES_USE_DEFAULT_COLORS */
|
||||||
|
-/* #undef HAVE_CURSES_IDCOK */
|
||||||
|
-/* #undef HAVE_CURSES_RESIZETERM */
|
||||||
|
-/* #undef HAVE_CURSES_WRESIZE */
|
||||||
|
-
|
||||||
|
-/* terminfo/termcap */
|
||||||
|
-#define HAVE_TERMINFO 1
|
||||||
|
-
|
||||||
|
-/* If set to 64, enables 64bit off_t for some systems (eg. Linux, Solaris) */
|
||||||
|
-#define _FILE_OFFSET_BITS 64
|
||||||
|
-
|
||||||
|
-/* What type should be used for uoff_t */
|
||||||
|
-/* #undef UOFF_T_INT */
|
||||||
|
-/* #undef UOFF_T_LONG */
|
||||||
|
-#define UOFF_T_LONG_LONG 1
|
||||||
|
-
|
||||||
|
-/* printf()-format for uoff_t, eg. "u" or "lu" or "llu" */
|
||||||
|
-#define PRIuUOFF_T "llu"
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the <dirent.h> header file. */
|
||||||
|
-#define HAVE_DIRENT_H 1
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the <dlfcn.h> header file. */
|
||||||
|
-#define HAVE_DLFCN_H 1
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the `fcntl' function. */
|
||||||
|
-#define HAVE_FCNTL 1
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the <inttypes.h> header file. */
|
||||||
|
-#define HAVE_INTTYPES_H 1
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the <memory.h> header file. */
|
||||||
|
-#define HAVE_MEMORY_H 1
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the `mkfifo' function. */
|
||||||
|
-#define HAVE_MKFIFO 1
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the `nl_langinfo' function. */
|
||||||
|
-#define HAVE_NL_LANGINFO 1
|
||||||
|
-
|
||||||
|
-/* Build with OpenSSL support */
|
||||||
|
-#define HAVE_OPENSSL
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the <openssl/err.h> header file. */
|
||||||
|
-/* #undef HAVE_OPENSSL_ERR_H */
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the <openssl/ssl.h> header file. */
|
||||||
|
-/* #undef HAVE_OPENSSL_SSL_H */
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the <regex.h> header file. */
|
||||||
|
-#define HAVE_REGEX_H 1
|
||||||
|
-
|
||||||
|
-/* Build with socks support */
|
||||||
|
-/* #undef HAVE_SOCKS */
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the <stdint.h> header file. */
|
||||||
|
-#define HAVE_STDINT_H 1
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the <stdlib.h> header file. */
|
||||||
|
-#define HAVE_STDLIB_H 1
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the <strings.h> header file. */
|
||||||
|
-#define HAVE_STRINGS_H 1
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the <string.h> header file. */
|
||||||
|
-#define HAVE_STRING_H 1
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
|
||||||
|
-#define HAVE_SYS_IOCTL_H 1
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the <sys/resource.h> header file. */
|
||||||
|
-#define HAVE_SYS_RESOURCE_H 1
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the <sys/stat.h> header file. */
|
||||||
|
-#define HAVE_SYS_STAT_H 1
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the <sys/time.h> header file. */
|
||||||
|
-#define HAVE_SYS_TIME_H 1
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the <sys/types.h> header file. */
|
||||||
|
-#define HAVE_SYS_TYPES_H 1
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the <sys/utsname.h> header file. */
|
||||||
|
-#define HAVE_SYS_UTSNAME_H 1
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the <unistd.h> header file. */
|
||||||
|
-#define HAVE_UNISTD_H 1
|
||||||
|
-
|
||||||
|
-/* Define to the address where bug reports for this package should be sent. */
|
||||||
|
-#define PACKAGE_BUGREPORT ""
|
||||||
|
-
|
||||||
|
-/* Define to the full name of this package. */
|
||||||
|
-#define PACKAGE_NAME "irssi"
|
||||||
|
-
|
||||||
|
-/* Define to the full name and version of this package. */
|
||||||
|
-#define PACKAGE_STRING "irssi 0.8.12"
|
||||||
|
-
|
||||||
|
-/* Define to the one symbol short name of this package. */
|
||||||
|
-#define PACKAGE_TARNAME "irssi"
|
||||||
|
-
|
||||||
|
-/* Define to the version of this package. */
|
||||||
|
-#define PACKAGE_VERSION "0.8.12"
|
||||||
|
-
|
||||||
|
-/* The size of `int', as computed by sizeof. */
|
||||||
|
-#define SIZEOF_INT 4
|
||||||
|
-
|
||||||
|
-/* The size of `long', as computed by sizeof. */
|
||||||
|
-#define SIZEOF_LONG 4
|
||||||
|
-
|
||||||
|
-/* The size of `long long', as computed by sizeof. */
|
||||||
|
-#define SIZEOF_LONG_LONG 8
|
||||||
|
-
|
||||||
|
-/* The size of `off_t', as computed by sizeof. */
|
||||||
|
-#define SIZEOF_OFF_T 8
|
||||||
|
-
|
||||||
|
-/* Define to 1 if you have the ANSI C header files. */
|
||||||
|
-#define STDC_HEADERS 1
|
||||||
|
-
|
||||||
|
-/* Number of bits in a file offset, on hosts where this is settable. */
|
||||||
|
-#define _FILE_OFFSET_BITS 64
|
||||||
|
-
|
||||||
|
-/* Define for large files, on AIX-style hosts. */
|
||||||
|
-/* #undef _LARGE_FILES */
|
||||||
|
-
|
||||||
|
-/* Define to 'int' if <sys/socket.h> doesn't define. */
|
||||||
|
-/* #undef socklen_t */
|
||||||
|
+#if __WORDSIZE == 32
|
||||||
|
+#include "config-32.h"
|
||||||
|
+#elif __WORDSIZE == 64
|
||||||
|
+#include "config-64.h"
|
||||||
|
+#else
|
||||||
|
+#error "Unknown word size"
|
||||||
|
+#endif
|
||||||
20
irssi.spec
20
irssi.spec
@ -3,16 +3,17 @@
|
|||||||
Summary: Modular text mode IRC client with Perl scripting
|
Summary: Modular text mode IRC client with Perl scripting
|
||||||
Name: irssi
|
Name: irssi
|
||||||
Version: 0.8.12
|
Version: 0.8.12
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: Applications/Communications
|
Group: Applications/Communications
|
||||||
URL: http://irssi.org/
|
URL: http://irssi.org/
|
||||||
Source0: http://irssi.org/files/irssi-%{version}.tar.bz2
|
Source0: http://irssi.org/files/irssi-%{version}.tar.bz2
|
||||||
|
Source1: config.h
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||||
BuildRequires: ncurses-devel openssl-devel zlib-devel
|
BuildRequires: ncurses-devel openssl-devel zlib-devel
|
||||||
BuildRequires: pkgconfig glib2-devel perl-devel
|
BuildRequires: pkgconfig glib2-devel perl-devel
|
||||||
|
|
||||||
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
@ -43,23 +44,24 @@ being maintained.
|
|||||||
--with-perl=yes \
|
--with-perl=yes \
|
||||||
--with-perl-lib=vendor
|
--with-perl-lib=vendor
|
||||||
|
|
||||||
make
|
make %{_smp_mflags}
|
||||||
|
mv config.h config-$(getconf LONG_BIT).h
|
||||||
|
cp -p %{SOURCE1} config.h
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
%makeinstall PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
|
%makeinstall PERL_INSTALL_ROOT=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
|
||||||
|
install -p config-$(getconf LONG_BIT).h $RPM_BUILD_ROOT%{_includedir}/config-$(getconf LONG_BIT).h
|
||||||
|
|
||||||
# Clean up
|
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a
|
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/lib*.*a
|
||||||
rm -Rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
|
rm -Rf $RPM_BUILD_ROOT/%{_docdir}/%{name}
|
||||||
find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name '*.bs' -a -empty -exec rm -f {} ';'
|
find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name '*.bs' -a -empty -exec rm -f {} ';'
|
||||||
find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name .packlist -exec rm {} ';'
|
find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -a -name .packlist -exec rm {} ';'
|
||||||
|
|
||||||
# Fix permissions
|
|
||||||
chmod -R u+w $RPM_BUILD_ROOT%{perl_vendorarch}
|
chmod -R u+w $RPM_BUILD_ROOT%{perl_vendorarch}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
@ -73,6 +75,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/%{name}
|
%{_datadir}/%{name}
|
||||||
%{_libdir}/%{name}
|
%{_libdir}/%{name}
|
||||||
%{_mandir}/man1/%{name}.1*
|
%{_mandir}/man1/%{name}.1*
|
||||||
|
%{_includedir}/%{name}/config-$(getconf LONG_BIT).h
|
||||||
%{perl_vendorarch}/Irssi*
|
%{perl_vendorarch}/Irssi*
|
||||||
%{perl_vendorarch}/auto/Irssi
|
%{perl_vendorarch}/auto/Irssi
|
||||||
|
|
||||||
@ -82,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_includedir}/irssi
|
%{_includedir}/irssi
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Mar 1 2008 Marek Mahut <mmahut@fedoraproject.org> - 0.8.12-6
|
||||||
|
- Fix for multiarch conflict (BZ#341591)
|
||||||
|
|
||||||
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.8.12-5
|
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.8.12-5
|
||||||
- Autorebuild for GCC 4.3
|
- Autorebuild for GCC 4.3
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user