summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/m4
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:14:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:29:45 +0100
commit29d6678fd546377459ef75cf54abeef5b969b5cf (patch)
tree8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-devtools/m4
parentda49de6885ee1bc424e70bc02f21f6ab920efb55 (diff)
downloadpoky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/m4')
-rw-r--r--meta/recipes-devtools/m4/m4-native_1.4.13.bb12
-rw-r--r--meta/recipes-devtools/m4/m4/ac_config_links.patch28
-rw-r--r--meta/recipes-devtools/m4/m4/make.patch41
-rw-r--r--meta/recipes-devtools/m4/m4_1.4.13.bb9
4 files changed, 90 insertions, 0 deletions
diff --git a/meta/recipes-devtools/m4/m4-native_1.4.13.bb b/meta/recipes-devtools/m4/m4-native_1.4.13.bb
new file mode 100644
index 0000000000..fa871b38ae
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4-native_1.4.13.bb
@@ -0,0 +1,12 @@
1require m4_${PV}.bb
2inherit native
3
4INHIBIT_AUTOTOOLS_DEPS = "1"
5DEPENDS += "gnu-config-native"
6
7do_configure() {
8 install -m 0644 ${STAGING_DATADIR}/gnu-config/config.sub .
9 install -m 0644 ${STAGING_DATADIR}/gnu-config/config.guess .
10 oe_runconf
11}
12
diff --git a/meta/recipes-devtools/m4/m4/ac_config_links.patch b/meta/recipes-devtools/m4/m4/ac_config_links.patch
new file mode 100644
index 0000000000..22103876e3
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4/ac_config_links.patch
@@ -0,0 +1,28 @@
1This patch fixes a build problem for m4-native experienced on Ubuntu 9.10,
2where autoconf/automake (AC_CONFIG_LINKS) ends up making GNUmakefile a
3symlink to itself.
4
5The patch comments out ac_config_links directly in configure,
6as autoreconf is not actually run for m4-native.
7
8I believe it should be safe, as GNUmakefile is actually unpacked from
9source, and what we want is to is to not touch it.
10
11Tested on x86_64_linux (Ubuntu 8.04 and 9.10).
12
132009-11-10 Esben Haabendal <eha@doredevelopment.dk>
14
15diff -urN m4-1.4.13.orig/configure m4-1.4.13/configure
16--- m4-1.4.13.orig/configure 2009-11-10 10:54:00.301707097 +0100
17+++ m4-1.4.13/configure 2009-11-10 10:54:17.314206379 +0100
18@@ -14860,8 +14860,8 @@
19 # only, it does not matter if we skip the link with older autoconf.
20 # Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH
21 # builds, so use a shell variable to bypass this.
22- GNUmakefile=GNUmakefile
23- ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile"
24+ # GNUmakefile=GNUmakefile
25+ # ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile"
26
27
28
diff --git a/meta/recipes-devtools/m4/m4/make.patch b/meta/recipes-devtools/m4/m4/make.patch
new file mode 100644
index 0000000000..3577b0b7db
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4/make.patch
@@ -0,0 +1,41 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- m4-1.4.2/doc/Makefile.in~make
7+++ m4-1.4.2/doc/Makefile.in
8@@ -57,9 +57,9 @@
9 date > $(srcdir)/stamp-vti
10
11 install: all
12- $(srcdir)/../mkinstalldirs $(infodir)
13+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(infodir)
14 cd $(srcdir) && for file in m4.info*; do \
15- $(INSTALL_DATA) $$file $(infodir)/$$file; \
16+ $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/$$file; \
17 done
18
19 uninstall:
20--- m4-1.4.2/src/Makefile.in~make
21+++ m4-1.4.2/src/Makefile.in
22@@ -35,7 +35,7 @@
23 prefix = @prefix@
24 exec_prefix = @exec_prefix@
25 transform = @program_transform_name@
26-bindir = $(exec_prefix)/bin
27+bindir = @bindir@
28
29 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
30 LINK = $(CC) $(LDFLAGS) -o $@
31@@ -84,8 +84,8 @@
32 $(LINK) ansi2knr.o $(LIBS)
33
34 install: all
35- $(srcdir)/../mkinstalldirs $(bindir)
36- $(INSTALL_PROGRAM) m4 $(bindir)/`echo m4 | sed '$(transform)'`
37+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
38+ $(INSTALL_PROGRAM) m4 $(DESTDIR)$(bindir)/`echo m4 | sed '$(transform)'`
39
40 uninstall:
41 rm -f $(bindir)/`echo m4 | sed '$(transform)'`
diff --git a/meta/recipes-devtools/m4/m4_1.4.13.bb b/meta/recipes-devtools/m4/m4_1.4.13.bb
new file mode 100644
index 0000000000..32d153ea12
--- /dev/null
+++ b/meta/recipes-devtools/m4/m4_1.4.13.bb
@@ -0,0 +1,9 @@
1DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor."
2LICENSE = "GPLv3"
3SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
4 file://ac_config_links.patch;patch=1"
5PR = "r2"
6
7inherit autotools
8
9EXTRA_OEMAKE += "'infodir=${infodir}'"