3 files changed, 72 insertions, 0 deletions

diff --git a/meta/packages/m4/m4-native_1.4.2.bb b/meta/packages/m4/m4-native_1.4.2.bb
new file mode 100644
index 0000000000..67fe36c7a1
--- /dev/null
+++ b/meta/packages/m4/m4-native_1.4.2.bb
@@ -0,0 +1,19 @@
+include m4_${PV}.bb
+
+inherit native
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/m4"
+
+INHIBIT_AUTOTOOLS_DEPS = "1"
+DEPENDS += "gnu-config-native"
+
+do_configure()  {
+        install -m 0644 ${STAGING_DATADIR}/gnu-config/config.sub .
+        install -m 0644 ${STAGING_DATADIR}/gnu-config/config.guess .
+        oe_runconf
+}
+
+do_stage() {
+        install -m 0755 src/m4 ${STAGING_BINDIR}/
+}
+
diff --git a/meta/packages/m4/m4/make.patch b/meta/packages/m4/m4/make.patch
new file mode 100644
index 0000000000..3577b0b7db
--- /dev/null
+++ b/meta/packages/m4/m4/make.patch
@@ -0,0 +1,41 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- m4-1.4.2/doc/Makefile.in~make
++++ m4-1.4.2/doc/Makefile.in
+@@ -57,9 +57,9 @@
+        date > $(srcdir)/stamp-vti
+ 
+ install: all
+-       $(srcdir)/../mkinstalldirs $(infodir)
++       $(srcdir)/../mkinstalldirs $(DESTDIR)$(infodir)
+        cd $(srcdir) && for file in m4.info*; do \
+-         $(INSTALL_DATA) $$file $(infodir)/$$file; \
++         $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/$$file; \
+        done
+ 
+ uninstall:
+--- m4-1.4.2/src/Makefile.in~make
++++ m4-1.4.2/src/Makefile.in
+@@ -35,7 +35,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ transform = @program_transform_name@
+-bindir = $(exec_prefix)/bin
++bindir = @bindir@
+ 
+ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+ LINK = $(CC) $(LDFLAGS) -o $@
+@@ -84,8 +84,8 @@
+        $(LINK) ansi2knr.o $(LIBS)
+ 
+ install: all
+-       $(srcdir)/../mkinstalldirs $(bindir)
+-       $(INSTALL_PROGRAM) m4 $(bindir)/`echo m4 | sed '$(transform)'`
++       $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
++       $(INSTALL_PROGRAM) m4 $(DESTDIR)$(bindir)/`echo m4 | sed '$(transform)'`
+ 
+ uninstall:
+        rm -f $(bindir)/`echo m4 | sed '$(transform)'`
diff --git a/meta/packages/m4/m4_1.4.2.bb b/meta/packages/m4/m4_1.4.2.bb
new file mode 100644
index 0000000000..9228ef4334
--- /dev/null
+++ b/meta/packages/m4/m4_1.4.2.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \
+processor."
+LICENSE = "GPL"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
+           file://make.patch;patch=1"
+S = "${WORKDIR}/m4-${PV}"
+
+inherit autotools
+
+EXTRA_AUTORECONF = "--exclude=autopoint,aclocal"
+EXTRA_OEMAKE += "'infodir=${infodir}'"