From 23360ad1018abf8b1144c6ac7f61d26b7b9e1f9d Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 20 Oct 2008 15:19:50 +0000 Subject: [PATCH] Makefile cleanup and explicitely disable pam headers checking which will cause compilation failure when pam headers are not installed on the host SVN-Revision: 13016 --- utils/at/Makefile | 7 ++-- utils/at/patches/120-no_pam.patch | 56 +++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 utils/at/patches/120-no_pam.patch diff --git a/utils/at/Makefile b/utils/at/Makefile index 3f438b23c..91875adee 100644 --- a/utils/at/Makefile +++ b/utils/at/Makefile @@ -34,8 +34,11 @@ endef export SENDMAIL=/bin/true EXTRA_CFLAGS:=-DNEED_YYWRAP -I$(PKG_BUILD_DIR) -I$(STAGING_DIR)/usr/include/libelf \ -L$(STAGING_DIR)/usr/lib -CONFIGURE_ARGS+=--with-daemon_username=nobody --with-daemon_groupname=nogroup \ - --with-jobdir=/var/spool/cron/atjobs --with-atspool=/var/spool/cron/atspool +CONFIGURE_ARGS+=--with-daemon_username=nobody \ + --with-daemon_groupname=nogroup \ + --with-jobdir=/var/spool/cron/atjobs \ + --with-atspool=/var/spool/cron/atspool \ + --without-pam \ define Package/at/install $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/sbin $(1)/etc/init.d/ diff --git a/utils/at/patches/120-no_pam.patch b/utils/at/patches/120-no_pam.patch new file mode 100644 index 000000000..905dbf984 --- /dev/null +++ b/utils/at/patches/120-no_pam.patch @@ -0,0 +1,56 @@ +diff -urN at-3.1.10ubuntu4/configure at-3.1.10ubuntu4.new/configure +--- at-3.1.10ubuntu4/configure 2006-06-28 04:21:49.000000000 +0200 ++++ at-3.1.10ubuntu4.new/configure 2008-10-20 17:20:27.000000000 +0200 +@@ -2687,50 +2687,8 @@ + fi + done + +-for ac_hdr in security/pam_appl.h +-do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:2695: checking for $ac_hdr" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext < +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:2705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <> confdefs.h <<\EOF +-#define HAVE_PAM 1 +-EOF +- +-else +- echo "$ac_t""no" 1>&6 +-fi +-done +- ++# Disable PAM ++echo "$ac_t""no" 1>&6 + + + # Extract the first word of "sendmail", so it can be a program name with args. -- 2.30.2