diff options
| author | Eric Andersen <andersen@codepoet.org> | 2003-12-03 22:49:02 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2003-12-03 22:49:02 +0000 |
| commit | d066b80a09f60cd5bafb291e7dcf4baef441423e (patch) | |
| tree | 621dce8f0c3b4e63603357d60f68f3f31c30c1fe | |
| parent | 435a4f723af2fc016eed62fe14175ab4867a522e (diff) | |
Fixup util-linux so it actually compiles
| -rw-r--r-- | make/util-linux.mk | 1 | ||||
| -rw-r--r-- | sources/util-linux.patch | 28 |
2 files changed, 29 insertions, 0 deletions
diff --git a/make/util-linux.mk b/make/util-linux.mk index d1ac18cca..ce6753a0c 100644 --- a/make/util-linux.mk +++ b/make/util-linux.mk @@ -15,6 +15,7 @@ $(DL_DIR)/$(UTIL-LINUX_SOURCE): $(UTIL-LINUX_DIR)/.unpacked: $(DL_DIR)/$(UTIL-LINUX_SOURCE) $(UTIL-LINUX_CAT) $(DL_DIR)/$(UTIL-LINUX_SOURCE) | tar -C $(BUILD_DIR) -xvf - + cat $(SOURCE_DIR)/util-linux.patch | patch -p1 -d $(UTIL-LINUX_DIR) touch $(UTIL-LINUX_DIR)/.unpacked $(UTIL-LINUX_DIR)/.configured: $(UTIL-LINUX_DIR)/.unpacked diff --git a/sources/util-linux.patch b/sources/util-linux.patch new file mode 100644 index 000000000..601e7dc11 --- /dev/null +++ b/sources/util-linux.patch @@ -0,0 +1,28 @@ +--- util-linux-2.11z/mount/fstab.c.orig 2003-12-03 15:28:22.000000000 -0700 ++++ util-linux-2.11z/mount/fstab.c 2003-12-03 15:28:41.000000000 -0700 +@@ -342,7 +342,7 @@ + /* Ensure that the lock is released if we are interrupted. */ + static void + handler (int sig) { +- die (EX_USER, "%s", sys_siglist[sig]); ++ die (EX_USER, "%s", strsignal(sig)); + } + + static void +--- /dev/null 2003-09-07 01:55:59.000000000 -0600 ++++ util-linux-2.11z/mount/swapargs.h 2003-12-03 15:44:50.000000000 -0700 +@@ -0,0 +1,3 @@ ++#define SWAPON_HAS_TWO_ARGS ++#include <asm/page.h> ++#include <sys/swap.h> +--- util-linux-2.11z/mount/swap.configure.orig 2003-12-03 15:43:24.000000000 -0700 ++++ util-linux-2.11z/mount/swap.configure 2003-12-03 15:45:33.000000000 -0700 +@@ -1,6 +1,8 @@ + # Find out whether we can include <sys/swap.h> + # and whether libc thinks that swapon() has two arguments. + ++exit 0 ++ + # Prepare test + CC=${CC-cc} + compile="$CC -o conftest conftest.c >/dev/null 2>&1" |