Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

slurm:

 * touch configure.in to prevent aclocal.m4 & configure from being regenerated, even being applied our no_host_curses.patch had no effect because of that (configure war overwritten)
 * simplify no_host_curses.patch
 * remove unnecessary overrides of CC and CFLAGS


git-svn-id: file:///var/svn/freetz/trunk@11486 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information...
commit fdc7c7e6ad85c0007783a3357e1ff1ac0a445cd7 1 parent 4b42685
er13 authored
Showing with 21 additions and 65 deletions.
  1. +16 −62 make/slurm/patches/001-no_host_curses.patch
  2. +5 −3 make/slurm/slurm.mk
View
78 make/slurm/patches/001-no_host_curses.patch
@@ -1,66 +1,20 @@
---- configure 2004-09-28 16:34:56.000000000 +0200
-+++ configure 2005-11-06 22:08:53.000000000 +0100
-@@ -4762,35 +4762,35 @@
+# Don't check for host ncurses headers
+
+--- configure
++++ configure
+@@ -4762,6 +4762,7 @@
_ACEOF
--for cursespath in /usr/include/ncurses.h /usr/local/include/ncurses.h /usr/local/include/ncurses/ncurses.h /opt/include/ncurses.h /opt/include/curses.h /usr/include/curses.h /usr/local/include/curses.h /dev/null
--do
-- test -f "${cursespath}" && break
--done
--case ${cursespath} in
-- /usr/include/*)
-- CFLAGS="$CFLAGS -I/usr/include"
-- LDFLAGS=""
-- ;;
-- /usr/local/include/ncurses/*)
-- CFLAGS="${CFLAGS} -I/usr/local/include/ncurses"
-- LDFLAGS="-L/usr/local/lib"
-- SOLLDFLAGS="-R/usr/local/lib"
-- ;;
-- /usr/local/include/*)
-- CFLAGS="${CFLAGS} -I/usr/local/include"
-- LDFLAGS="-L/usr/local/lib"
-- SOLLDFLAGS="-R/usr/local/lib"
-- ;;
-- /opt/include/*)
-- CFLAGS="${CFLAGS} -I/opt/include"
-- LDFLAGS="-L/opt/lib"
-- SOLLDFLAGS="-R/opt/lib"
-- ;;
--esac
-+#for cursespath in /usr/include/ncurses.h /usr/local/include/ncurses.h /usr/local/include/ncurses/ncurses.h /opt/include/ncurses.h /opt/include/curses.h /usr/include/curses.h /usr/local/include/curses.h /dev/null
-+#do
-+# test -f "${cursespath}" && break
-+#done
-+#case ${cursespath} in
-+# /usr/include/*)
-+# CFLAGS="$CFLAGS -I/usr/include"
-+# LDFLAGS=""
-+# ;;
-+# /usr/local/include/ncurses/*)
-+# CFLAGS="${CFLAGS} -I/usr/local/include/ncurses"
-+# LDFLAGS="-L/usr/local/lib"
-+# SOLLDFLAGS="-R/usr/local/lib"
-+# ;;
-+# /usr/local/include/*)
-+# CFLAGS="${CFLAGS} -I/usr/local/include"
-+# LDFLAGS="-L/usr/local/lib"
-+# SOLLDFLAGS="-R/usr/local/lib"
-+# ;;
-+# /opt/include/*)
-+# CFLAGS="${CFLAGS} -I/opt/include"
-+# LDFLAGS="-L/opt/lib"
-+# SOLLDFLAGS="-R/opt/lib"
-+# ;;
-+#esac
++if false; then
+ for cursespath in /usr/include/ncurses.h /usr/local/include/ncurses.h /usr/local/include/ncurses/ncurses.h /opt/include/ncurses.h /opt/include/curses.h /usr/include/curses.h /usr/local/include/curses.h /dev/null
+ do
+ test -f "${cursespath}" && break
+@@ -4787,6 +4788,7 @@
+ SOLLDFLAGS="-R/opt/lib"
+ ;;
+ esac
++fi
# add Slowlaris -R and libraries to LDFLAGS
--if test ${OSTYPE} = "solaris" ; then
-- LDFLAGS="${LDFLAGS} ${SOLLDFLAGS} -lnsl -lsocket -lkstat"
--fi
-+#if test ${OSTYPE} = "solaris" ; then
-+# LDFLAGS="${LDFLAGS} ${SOLLDFLAGS} -lnsl -lsocket -lkstat"
-+#fi
-
- echo "$as_me:$LINENO: checking for vanilla_coke in -lfridge" >&5
- echo $ECHO_N "checking for vanilla_coke in -lfridge... $ECHO_C" >&6
+ if test ${OSTYPE} = "solaris" ; then
+ LDFLAGS="${LDFLAGS} ${SOLLDFLAGS} -lnsl -lsocket -lkstat"
View
8 make/slurm/slurm.mk
@@ -2,19 +2,21 @@ $(call PKG_INIT_BIN, 0.3.3)
$(PKG)_SOURCE:=slurm-$($(PKG)_VERSION).tar.gz
$(PKG)_SOURCE_MD5:=e68d09202b835c644f7f6b7f070f29a2
$(PKG)_SITE:=http://www.wormulon.net/slurm
+
$(PKG)_BINARY:=$($(PKG)_DIR)/slurm
$(PKG)_TARGET_BINARY:=$($(PKG)_DEST_DIR)/usr/bin/slurm
$(PKG)_DEPENDS_ON := ncurses
+# touch configure.in to prevent aclocal.m4 & configure from being regenerated
+$(PKG)_CONFIGURE_PRE_CMDS += touch -t 200001010000.00 ./configure.in;
+
$(PKG_SOURCE_DOWNLOAD)
$(PKG_UNPACKED)
$(PKG_CONFIGURED_CONFIGURE)
$($(PKG)_BINARY): $($(PKG)_DIR)/.configured
- $(SUBMAKE) -C $(SLURM_DIR) \
- CC="$(TARGET_CC)" \
- CFLAGS="$(TARGET_CFLAGS)"
+ $(SUBMAKE) -C $(SLURM_DIR)
$($(PKG)_TARGET_BINARY): $($(PKG)_BINARY)
$(INSTALL_BINARY_STRIP)
Please sign in to comment.
Something went wrong with that request. Please try again.