aboutsummaryrefslogtreecommitdiff
path: root/package/file
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2004-10-09 02:49:33 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2004-10-09 02:49:33 +0000
commit44eedc5c44416a97b3f5ca03d596ec3c9fb29380 (patch)
tree96f605b4cd9934fc1d09319490c672aaab44ce2f /package/file
parent73f7be82904f487d167493e76b415fbe5b5f8c5a (diff)
downloadbuildroot-44eedc5c44416a97b3f5ca03d596ec3c9fb29380.tar.gz
buildroot-44eedc5c44416a97b3f5ca03d596ec3c9fb29380.tar.bz2
facelift step number two
Diffstat (limited to 'package/file')
-rw-r--r--package/file/file.mk2
-rw-r--r--package/file/file.patch30
2 files changed, 31 insertions, 1 deletions
diff --git a/package/file/file.mk b/package/file/file.mk
index ad21956c72..1bdaf788e2 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -18,7 +18,7 @@ file-source: $(DL_DIR)/$(FILE_SOURCE)
$(FILE_DIR)/.unpacked: $(DL_DIR)/$(FILE_SOURCE)
$(FILE_CAT) $(DL_DIR)/$(FILE_SOURCE) | tar -C $(BUILD_DIR) -xvf -
- cat $(SOURCE_DIR)/file.patch | patch -p1 -d $(FILE_DIR)
+ toolchain/patch-kernel.sh $(FILE_DIR) package/file/ file\*.patch
touch $(FILE_DIR)/.unpacked
$(FILE_DIR)/.configured: $(FILE_DIR)/.unpacked
diff --git a/package/file/file.patch b/package/file/file.patch
new file mode 100644
index 0000000000..b2b7d3c807
--- /dev/null
+++ b/package/file/file.patch
@@ -0,0 +1,30 @@
+--- file-4.10/magic/Makefile.in.orig 2004-07-24 14:38:55.000000000 -0600
++++ file-4.10/magic/Makefile.in 2004-07-28 12:16:23.000000000 -0600
+@@ -490,10 +490,10 @@
+ done >> $@
+
+ magic.mgc: magic
+- $(top_builddir)/src/file -C -m magic
++ /usr/bin/file -C -m magic
+
+ magic.mime.mgc: magic.mime
+- $(top_builddir)/src/file -C -m $(srcdir)/magic.mime
++ /usr/bin/file -C -m $(srcdir)/magic.mime
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+--- file-4.10/magic/Makefile.am.orig 2004-07-24 14:38:55.000000000 -0600
++++ file-4.10/magic/Makefile.am 2004-07-28 12:18:15.000000000 -0600
+@@ -16,10 +16,10 @@
+ done >> $@
+
+ magic.mgc: magic
+- $(top_builddir)/src/file -C -m magic
++ /usr/bin/file -C -m magic
+
+ magic.mime.mgc: magic.mime
+- $(top_builddir)/src/file -C -m $(srcdir)/magic.mime
++ /usr/bin/file -C -m $(srcdir)/magic.mime
+
+ magic_FRAGMENTS = \
+ Magdir/acorn \