| 1 |
vapier 14/01/23 01:35:02 |
| 2 |
|
| 3 |
Added: smtptools-0.2.3-autotools.patch |
| 4 |
Log: |
| 5 |
Modernize the build to fix cross-compiling. |
| 6 |
|
| 7 |
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-mail/smtptools/files/smtptools-0.2.3-autotools.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/smtptools/files/smtptools-0.2.3-autotools.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/smtptools/files/smtptools-0.2.3-autotools.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: smtptools-0.2.3-autotools.patch |
| 16 |
=================================================================== |
| 17 |
the autotools in this are ridiculously ancient (over 15 years old). |
| 18 |
update them to something reasonable. |
| 19 |
|
| 20 |
--- a/Makefile.am |
| 21 |
+++ b/Makefile.am |
| 22 |
@@ -1,7 +1,7 @@ |
| 23 |
#noinst_SCRIPTS=systype |
| 24 |
PACKAGE_VERSION=@PACKAGE@-@VERSION@ |
| 25 |
# i can do that better ... |
| 26 |
-AUTOMAKE_OPTIONS=no-dependencies ansi2knr readme-alpha 1.3 gnu |
| 27 |
+AUTOMAKE_OPTIONS=no-dependencies readme-alpha gnu |
| 28 |
man_MANS=smtpblast.1 usmtpd.1 tomaildir.1 maildirblast.1 rewriteheader.1 |
| 29 |
EXTRA_DIST= attribs.h crc32ansi.h dirsysdep.h dns.h dynhash.h \ |
| 30 |
dns_int.h filelock.h \ |
| 31 |
@@ -41,31 +41,6 @@ maildirblast_SOURCES=maildirblast.c smtp.c runqueue.c \ |
| 32 |
uosock_connect.c filelock.c uogetopt.c str2long.c str2ulong.c |
| 33 |
maildirblast_LDADD=libdns.a libmta.a libstr.a libio.a @LIBOBJS@ |
| 34 |
|
| 35 |
-if HAVE_GNU_MAKE |
| 36 |
-## We must create the .deps directory if it doesn't exist. We do it |
| 37 |
-## in this strange way to make sure the .deps directory exists, |
| 38 |
-## without trying to run mkdir for each compilation. |
| 39 |
-## stolen from automake |
| 40 |
-DEPS_MAGIC := $(shell mkdir deps > /dev/null 2>&1 || :) |
| 41 |
-endif |
| 42 |
- |
| 43 |
-if HAVE_GNU_MAKE |
| 44 |
-# no dependency tracking without GNU make |
| 45 |
-## |
| 46 |
-## automake depencency stuff is unreliable, it will not |
| 47 |
-## recreate .deps/xxx.P if it has been removed. |
| 48 |
-## and anyway, i dislike hidden directories. |
| 49 |
--include $(addprefix ./deps/,$(SOURCES:.c=.d)) |
| 50 |
-deps/%.d: %.c |
| 51 |
-if HAVE_GCC_DEP |
| 52 |
- @echo mkdep $< |
| 53 |
- @$(COMPILE) -Wp,-MMD,./deps/$(@F) -E $< >/dev/null |
| 54 |
-else |
| 55 |
-# no dependency generating without GCC |
| 56 |
- @exit 0 |
| 57 |
-endif |
| 58 |
-endif |
| 59 |
- |
| 60 |
rpm: $(PACKAGE_VERSION).tar.gz Specfile |
| 61 |
$(srcdir)/buildrpm $(srcdir) |
| 62 |
success: |
| 63 |
--- a/acinclude.m4 |
| 64 |
+++ b/acinclude.m4 |
| 65 |
@@ -1,4 +1,4 @@ |
| 66 |
-AC_DEFUN(UO_HEADER_SYS_SELECT, |
| 67 |
+AC_DEFUN([UO_HEADER_SYS_SELECT], |
| 68 |
[AC_CACHE_CHECK([whether sys/time.h and sys/select.h may both be included], |
| 69 |
lrzsz_cv_header_sys_select, |
| 70 |
[AC_TRY_COMPILE([#include <sys/types.h> |
| 71 |
@@ -6,7 +6,7 @@ AC_DEFUN(UO_HEADER_SYS_SELECT, |
| 72 |
#include <sys/select.h>], |
| 73 |
[struct tm *tp;], lrzsz_cv_header_sys_select=yes, lrzsz_cv_header_sys_select=no)]) |
| 74 |
if test $lrzsz_cv_header_sys_select = no; then |
| 75 |
-AC_DEFINE(SYS_TIME_WITHOUT_SYS_SELECT) |
| 76 |
+AC_DEFINE(SYS_TIME_WITHOUT_SYS_SELECT, 1, [blah]) |
| 77 |
fi |
| 78 |
]) |
| 79 |
|
| 80 |
--- a/configure.in |
| 81 |
+++ b/configure.in |
| 82 |
@@ -1,7 +1,9 @@ |
| 83 |
-AC_INIT(smtpblast.c) |
| 84 |
-AM_INIT_AUTOMAKE(smtptools, 0.2.3) |
| 85 |
+AC_INIT(smtptools, 0.2.3) |
| 86 |
+AM_INIT_AUTOMAKE |
| 87 |
AM_CONFIG_HEADER(config.h) |
| 88 |
|
| 89 |
+AH_BOTTOM([#define P__(x) x]) |
| 90 |
+ |
| 91 |
if test "x$CFLAGS" = x ; then |
| 92 |
if test "x$CC" = "xlcc" ; then |
| 93 |
if test "x$_CFLAGS_LCC" != x ; then |
| 94 |
@@ -23,38 +25,19 @@ AC_ARG_ENABLE(efence, |
| 95 |
dnl Checks for programs. |
| 96 |
AC_PROG_CC |
| 97 |
AC_PROG_CPP |
| 98 |
-if test "x$GCC" = xyes ; then |
| 99 |
- AC_MSG_CHECKING([whether gcc supports -Wp,-MMD]) |
| 100 |
- old="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS -Wp,-MMD,myconftest.out -E" |
| 101 |
- AC_TRY_CPP(int main(void) {return 0;},test -s myconftest.out && GCC_DEP=yes) |
| 102 |
- rm -f myconftest.out |
| 103 |
- CPPFLAGS="$old"; |
| 104 |
- if test "x$GCC_DEP" = xyes ; then AC_MSG_RESULT(yes) ; else AC_MSG_RESULT(no); fi |
| 105 |
-fi |
| 106 |
-if test "x$GCC_DEP" = xyes ; then : ; else |
| 107 |
- AC_MSG_WARN([dependency tracking disabled]) |
| 108 |
-fi |
| 109 |
AM_CONDITIONAL(HAVE_GCC_DEP, test "x$GCC_DEP" = "xyes") |
| 110 |
+AC_CHECK_TOOL(AR, ar) |
| 111 |
AC_PROG_RANLIB |
| 112 |
AC_CHECK_PROGS(MAKE,gnumake gmake make pmake,make) |
| 113 |
-AC_MSG_CHECKING([for GNU make]) |
| 114 |
- echo "include confMakefile2" >confMakefile1 |
| 115 |
- echo "TESTFORGNUMAKE:" >confMakefile2 |
| 116 |
- GNU_MAKE=no |
| 117 |
- $MAKE -f confMakefile1 >/dev/null 2>/dev/null && GNU_MAKE=yes |
| 118 |
- rm -f confMakefile2 confMakefile1 |
| 119 |
- AC_MSG_RESULT($GNU_MAKE) |
| 120 |
- AM_CONDITIONAL(HAVE_GNU_MAKE, test "x$GNU_MAKE" = "xyes") |
| 121 |
- if test "x$GNU_MAKE" = "xno" ; then |
| 122 |
- AC_MSG_WARN([dependencies disabled]) |
| 123 |
- fi |
| 124 |
-AM_C_PROTOTYPES |
| 125 |
|
| 126 |
dnl Checks for libraries. |
| 127 |
if test "x$WANT_EFENCE" = x ; then : ; else |
| 128 |
AC_CHECK_LIB(efence, main) |
| 129 |
fi |
| 130 |
+dnl glibc uses the symbol __dn_expand and provides a dn_expand define |
| 131 |
+dnl which expands into __dn_expand. check for both. |
| 132 |
AC_CHECK_LIB(resolv, dn_expand) |
| 133 |
+AC_CHECK_LIB(resolv, __dn_expand) |
| 134 |
dnl SCO needs this. |
| 135 |
AC_CHECK_LIB(socket,syslog,,,) |
| 136 |
dnl slowlartis needs this |
Archives