Browse Source

fix cross-compile on Darwin

Waldemar Brodkorb 11 years ago
parent
commit
4e5033a06b

+ 1 - 2
package/mdadm/Makefile

@@ -17,8 +17,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,MDADM,mdadm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
-
-XAKE_FLAGS+=		CROSS_COMPILE="${TARGET_CROSS}"
+XAKE_FLAGS+=		CROSS_COMPILE="${TARGET_CROSS}" CHECK_RUN_DIR=0
 
 mdadm-install:
 	${INSTALL_DIR} ${IDIR_MDADM}/usr/sbin

+ 3 - 2
package/monit/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		monit
 PKG_VERSION:=		5.6
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		19dfc1ce8512e832134d06eedd96ba50
 PKG_DESCR:=		An utility for system services monitoring
 PKG_SECTION:=		admin
@@ -20,7 +20,8 @@ $(eval $(call PKG_template,MONIT,monit,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
 
 CONFIGURE_ENV+=		libmonit_cv_setjmp_available=yes \
 			libmonit_cv_vsnprintf_c99_conformant=yes
-CONFIGURE_ARGS+=	--with-ssl --with-ssl-dir="${STAGING_TARGET_DIR}/usr"
+CONFIGURE_ARGS+=	--with-ssl --with-ssl-dir="${STAGING_TARGET_DIR}/usr" \
+			--without-pam
 
 monit-install:
 	${INSTALL_DIR} ${IDIR_MONIT}/etc

+ 2 - 2
package/pam/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		1.1.8
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		5107bbf54042400b6200e8367cc7feef
 PKG_DESCR:=		Pluggable Authentication Modules
-PKG_BUILDDEP:=		flex
+PKG_BUILDDEP:=		flex-host flex
 PKG_SECTION:=		misc
 PKG_URL:=		http://www.linux-pam.org/
 PKG_SITES:=		http://www.linux-pam.org/library/
@@ -21,8 +21,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,PAM,pam,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-#XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 CONFIGURE_ARGS+=	--disable-nis \
+			--disable-regenerate-docu \
 			--enable-db=no
 
 post-install:

+ 11 - 0
package/pam/patches/patch-Makefile_in

@@ -0,0 +1,11 @@
+--- Linux-PAM-1.1.8.orig/Makefile.in	2013-09-19 10:01:36.000000000 +0200
++++ Linux-PAM-1.1.8/Makefile.in	2014-02-10 15:26:20.000000000 +0100
+@@ -288,7 +288,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news
+-SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests
++SUBDIRS = libpam tests libpamc libpam_misc modules po conf examples xtests
+ CLEANFILES = *~
+ EXTRA_DIST = pgp.keys.asc CHANGELOG ChangeLog-CVS Copyright Make.xml.rules
+ ACLOCAL_AMFLAGS = -I m4

+ 2 - 2
package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c

@@ -1,6 +1,6 @@
 --- Linux-PAM-1.1.8.orig/modules/pam_succeed_if/pam_succeed_if.c	2013-06-18 16:11:21.000000000 +0200
-+++ Linux-PAM-1.1.8/modules/pam_succeed_if/pam_succeed_if.c	2013-12-21 18:30:19.000000000 +0100
-@@ -233,16 +233,20 @@ evaluate_notingroup(pam_handle_t *pamh,
++++ Linux-PAM-1.1.8/modules/pam_succeed_if/pam_succeed_if.c	2014-02-10 11:36:17.000000000 +0100
+@@ -233,16 +233,20 @@ evaluate_notingroup(pam_handle_t *pamh, 
  static int
  evaluate_innetgr(const char *host, const char *user, const char *group)
  {

+ 2 - 2
package/pam/patches/patch-modules_pam_time_pam_time_c

@@ -1,6 +1,6 @@
 --- Linux-PAM-1.1.8.orig/modules/pam_time/pam_time.c	2013-06-18 16:11:21.000000000 +0200
-+++ Linux-PAM-1.1.8/modules/pam_time/pam_time.c	2013-12-21 18:30:19.000000000 +0100
-@@ -554,9 +554,11 @@ check_account(pam_handle_t *pamh, const
++++ Linux-PAM-1.1.8/modules/pam_time/pam_time.c	2014-02-10 11:36:17.000000000 +0100
+@@ -554,9 +554,11 @@ check_account(pam_handle_t *pamh, const 
  	       continue;
  	  }
  	  /* If buffer starts with @, we are using netgroups */