diff options
Diffstat (limited to 'meta/packages/m4')
-rw-r--r-- | meta/packages/m4/m4-native_1.4.13.bb | 12 | ||||
-rw-r--r-- | meta/packages/m4/m4/ac_config_links.patch | 28 | ||||
-rw-r--r-- | meta/packages/m4/m4/make.patch | 41 | ||||
-rw-r--r-- | meta/packages/m4/m4_1.4.13.bb | 9 |
4 files changed, 0 insertions, 90 deletions
diff --git a/meta/packages/m4/m4-native_1.4.13.bb b/meta/packages/m4/m4-native_1.4.13.bb deleted file mode 100644 index fa871b38a..000000000 --- a/meta/packages/m4/m4-native_1.4.13.bb +++ /dev/null @@ -1,12 +0,0 @@ -require m4_${PV}.bb -inherit native - -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 -} - diff --git a/meta/packages/m4/m4/ac_config_links.patch b/meta/packages/m4/m4/ac_config_links.patch deleted file mode 100644 index 22103876e..000000000 --- a/meta/packages/m4/m4/ac_config_links.patch +++ /dev/null @@ -1,28 +0,0 @@ -This patch fixes a build problem for m4-native experienced on Ubuntu 9.10, -where autoconf/automake (AC_CONFIG_LINKS) ends up making GNUmakefile a -symlink to itself. - -The patch comments out ac_config_links directly in configure, -as autoreconf is not actually run for m4-native. - -I believe it should be safe, as GNUmakefile is actually unpacked from -source, and what we want is to is to not touch it. - -Tested on x86_64_linux (Ubuntu 8.04 and 9.10). - -2009-11-10 Esben Haabendal <eha@doredevelopment.dk> - -diff -urN m4-1.4.13.orig/configure m4-1.4.13/configure ---- m4-1.4.13.orig/configure 2009-11-10 10:54:00.301707097 +0100 -+++ m4-1.4.13/configure 2009-11-10 10:54:17.314206379 +0100 -@@ -14860,8 +14860,8 @@ - # only, it does not matter if we skip the link with older autoconf. - # Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH - # builds, so use a shell variable to bypass this. -- GNUmakefile=GNUmakefile -- ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" -+ # GNUmakefile=GNUmakefile -+ # ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" - - - diff --git a/meta/packages/m4/m4/make.patch b/meta/packages/m4/m4/make.patch deleted file mode 100644 index 3577b0b7d..000000000 --- a/meta/packages/m4/m4/make.patch +++ /dev/null @@ -1,41 +0,0 @@ - -# -# 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.13.bb b/meta/packages/m4/m4_1.4.13.bb deleted file mode 100644 index 32d153ea1..000000000 --- a/meta/packages/m4/m4_1.4.13.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor." -LICENSE = "GPLv3" -SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \ - file://ac_config_links.patch;patch=1" -PR = "r2" - -inherit autotools - -EXTRA_OEMAKE += "'infodir=${infodir}'" |