summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2006-03-08 16:15:15 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-03-08 16:15:15 +0000
commit4ca2438a9db94dc1ef5376087974a5f08e834927 (patch)
treefa1bdc310c407fd8bb8dab0fab129af90f9ec85d /packages
parentd706e4d73209cb7d1022e50e8dc4e3974f79c5b1 (diff)
file-native 4.16: use just built 'file' to generate magic files - now it should not break with older file-native installed
Diffstat (limited to 'packages')
-rw-r--r--packages/file/file-native_4.16.bb3
-rw-r--r--packages/file/files/.mtn2git_empty0
-rw-r--r--packages/file/files/native-fix.diff13
3 files changed, 16 insertions, 0 deletions
diff --git a/packages/file/file-native_4.16.bb b/packages/file/file-native_4.16.bb
index f92ff15f78..3228ed683c 100644
--- a/packages/file/file-native_4.16.bb
+++ b/packages/file/file-native_4.16.bb
@@ -3,3 +3,6 @@ inherit native
# avoid dependency loop
DEPENDS = ""
+PR = "r1"
+
+SRC_URI += "file://native-fix.diff;patch=1"
diff --git a/packages/file/files/.mtn2git_empty b/packages/file/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/file/files/.mtn2git_empty
diff --git a/packages/file/files/native-fix.diff b/packages/file/files/native-fix.diff
new file mode 100644
index 0000000000..d17215a1b4
--- /dev/null
+++ b/packages/file/files/native-fix.diff
@@ -0,0 +1,13 @@
+Index: file-4.16/magic/Makefile.am
+===================================================================
+--- file-4.16.orig/magic/Makefile.am 2005-08-18 17:20:49.000000000 +0200
++++ file-4.16/magic/Makefile.am 2006-03-08 17:01:13.000000000 +0100
+@@ -18,7 +18,7 @@
+ if IS_CROSS_COMPILE
+ FILE_COMPILE = file
+ else
+-FILE_COMPILE = $(top_builddir)/src/file
++FILE_COMPILE = ../src/file
+ endif
+
+ magic.mgc: magic