From bbd1fd18a2bd95b43cad8d7c31b5bdf6c89decdc Mon Sep 17 00:00:00 2001 From: wbx Date: Thu, 23 Mar 2006 10:37:38 +0000 Subject: [PATCH] fix procmail compile, thx Michael git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3454 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/procmail/Makefile | 4 +- .../procmail/patches/promail_openwrt.patch | 51 +++++++++++++++++++ 2 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 package/procmail/patches/promail_openwrt.patch diff --git a/package/procmail/Makefile b/package/procmail/Makefile index ce7909cb3..ace0a0bf7 100644 --- a/package/procmail/Makefile +++ b/package/procmail/Makefile @@ -18,11 +18,9 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,PROCMAIL,procmail,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR)/ init \ + $(MAKE) -C $(PKG_BUILD_DIR)/src -f ../Makefile.openwrt \ CC=$(TARGET_CC) - echo yes | $(MAKE) -C $(PKG_BUILD_DIR)/src/ procmail formail \ - CC=$(TARGET_CC) touch $@ $(IPKG_PROCMAIL): diff --git a/package/procmail/patches/promail_openwrt.patch b/package/procmail/patches/promail_openwrt.patch new file mode 100644 index 000000000..c33d82605 --- /dev/null +++ b/package/procmail/patches/promail_openwrt.patch @@ -0,0 +1,51 @@ +This patch is required to make procmail cross compile - it tries to run some automatic tests which +obviously do not work in a cross compiled environment. + + +diff -Naur procmail-3.22_orig/autoconf.h procmail-3.22/autoconf.h +--- procmail-3.22_orig/autoconf.h 1970-01-01 10:00:00.000000000 +1000 ++++ procmail-3.22/autoconf.h 2006-03-23 12:15:36.000000000 +1100 +@@ -0,0 +1,21 @@ ++/* This file was automagically generated by autoconf */ ++ ++/* 5 moves in 64 steps of size 16384 when reallocing */ ++#define NOpw_class ++#define NOstrlcat ++#define NOsetrgid ++#define MAX_argc 7588 ++/* Your system's strstr() is 1.12 times FASTER than my C-routine */ ++#define UDP_protocolno 17 ++#define BIFF_serviceport "512" ++#define IP_localhost {127,0,0,1} ++#define MAILSPOOLDIR "/var/spool/mail/" ++#define SENDMAIL "/usr/sbin/sendmail" ++#define CF_no_procmail_yet ++#define buggy_SENDMAIL ++#define defPATH "PATH=$HOME/bin:/bin:/usr/bin:/usr/local/bin:/usr/bin/X11" ++#define defSPATH "PATH=/bin:/usr/bin:/usr/local/bin:/usr/bin/X11" ++#define PM_VERSION "3.22" ++/* Hotwire LOCKINGTEST=100 */ ++/* Procmail will lock via: dotlocking, fcntl() */ ++/* autoconf completed */ +diff -Naur procmail-3.22_orig/Makefile.openwrt procmail-3.22/Makefile.openwrt +--- procmail-3.22_orig/Makefile.openwrt 1970-01-01 10:00:00.000000000 +1000 ++++ procmail-3.22/Makefile.openwrt 2006-03-23 12:15:36.000000000 +1100 +@@ -0,0 +1,18 @@ ++PM_OBJ=cstdio.o common.o exopen.o goodies.o locking.o \ ++ mailfold.o foldinfo.o misc.o pipes.o regexp.o robust.o \ ++ sublib.o acommon.o mcommon.o lastdirsep.o authenticate.o \ ++ lmtp.o memblk.o variables.o from.o comsat.o ++ ++FM_OBJ=common.o fields.o formisc.o sublib.o ecommon.o \ ++ acommon.o ++ ++LDFLAGS = -lm -lnsl -ldl -lc ++CFLAGS = -Os -DPROCMAIL ++ ++all: procmail formail ++ ++procmail: procmail.o $(PM_OBJ) ++ $(CC) $(CFLAGS) $@.o $(PM_OBJ) -o $@ $(LDFLAGS) ++ ++formail: formail.o $(FM_OBJ) ++ $(CC) $(CFLAGS) $@.o $(FM_OBJ) -o $@ $(LDFLAGS) -- 2.20.1