summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/acinclude.m486
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/mkdir.patch29
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/quotefix.patch47
3 files changed, 0 insertions, 162 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/acinclude.m4 b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/acinclude.m4
deleted file mode 100644
index 4b00668476..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/acinclude.m4
+++ /dev/null
@@ -1,86 +0,0 @@
1# Extracted from the package's shipped aclocal.m4. Custom macros should be in
2# acinclude.m4 so running aclocal doesn't blow them away.
3#
4# RP 1/6/2010
5
6# ===========================================================================
7# http://www.nongnu.org/autoconf-archive/check_gnu_make.html
8# ===========================================================================
9#
10# SYNOPSIS
11#
12# CHECK_GNU_MAKE()
13#
14# DESCRIPTION
15#
16# This macro searches for a GNU version of make. If a match is found, the
17# makefile variable `ifGNUmake' is set to the empty string, otherwise it
18# is set to "#". This is useful for including a special features in a
19# Makefile, which cannot be handled by other versions of make. The
20# variable _cv_gnu_make_command is set to the command to invoke GNU make
21# if it exists, the empty string otherwise.
22#
23# Here is an example of its use:
24#
25# Makefile.in might contain:
26#
27# # A failsafe way of putting a dependency rule into a makefile
28# $(DEPEND):
29# $(CC) -MM $(srcdir)/*.c > $(DEPEND)
30#
31# @ifGNUmake@ ifeq ($(DEPEND),$(wildcard $(DEPEND)))
32# @ifGNUmake@ include $(DEPEND)
33# @ifGNUmake@ endif
34#
35# Then configure.in would normally contain:
36#
37# CHECK_GNU_MAKE()
38# AC_OUTPUT(Makefile)
39#
40# Then perhaps to cause gnu make to override any other make, we could do
41# something like this (note that GNU make always looks for GNUmakefile
42# first):
43#
44# if ! test x$_cv_gnu_make_command = x ; then
45# mv Makefile GNUmakefile
46# echo .DEFAULT: > Makefile ;
47# echo \ $_cv_gnu_make_command \$@ >> Makefile;
48# fi
49#
50# Then, if any (well almost any) other make is called, and GNU make also
51# exists, then the other make wraps the GNU make.
52#
53# LICENSE
54#
55# Copyright (c) 2008 John Darrington <j.darrington@elvis.murdoch.edu.au>
56#
57# Copying and distribution of this file, with or without modification, are
58# permitted in any medium without royalty provided the copyright notice
59# and this notice are preserved.
60#
61# Note: Modified by Ted Ts'o to add @ifNotGNUMake@
62
63AC_DEFUN(
64 [CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command,
65 _cv_gnu_make_command='' ;
66dnl Search all the common names for GNU make
67 for a in "$MAKE" make gmake gnumake ; do
68 if test -z "$a" ; then continue ; fi ;
69 if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
70 _cv_gnu_make_command=$a ;
71 break;
72 fi
73 done ;
74 ) ;
75dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise
76 if test "x$_cv_gnu_make_command" != "x" ; then
77 ifGNUmake='' ;
78 ifNotGNUmake='#' ;
79 else
80 ifGNUmake='#' ;
81 ifNotGNUmake='' ;
82 AC_MSG_RESULT("Not found");
83 fi
84 AC_SUBST(ifGNUmake)
85 AC_SUBST(ifNotGNUmake)
86] )
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/mkdir.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/mkdir.patch
deleted file mode 100644
index e91ffa96c4..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/mkdir.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2Signed-off-by: Mei Lei <lei.mei@intel.com>
3
4Index: e2fsprogs-1.41.5/po/Makefile.in.in
5===================================================================
6--- e2fsprogs-1.41.5.orig/po/Makefile.in.in 2009-02-14 13:49:08.000000000 +0000
7+++ e2fsprogs-1.41.5/po/Makefile.in.in 2009-08-19 17:52:31.000000000 +0100
8@@ -30,7 +30,7 @@
9 INSTALL = @INSTALL@
10 INSTALL_DATA = @INSTALL_DATA@
11 MKINSTALLDIRS = @MKINSTALLDIRS@
12-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
13+mkinstalldirs = $(MKINSTALLDIRS)
14
15 GMSGFMT = @GMSGFMT@
16 MSGFMT = @MSGFMT@
17Index: e2fsprogs-1.41.5/configure.in
18===================================================================
19--- e2fsprogs-1.41.5.orig/configure.in 2009-08-19 17:53:50.000000000 +0100
20+++ e2fsprogs-1.41.5/configure.in 2009-08-19 17:48:38.000000000 +0100
21@@ -970,6 +970,8 @@
22 fi
23 AC_SUBST(BUILD_CFLAGS)
24 AC_SUBST(BUILD_LDFLAGS)
25+MKINSTALLDIRS="mkdir -p"
26+AC_SUBST(MKINSTALLDIRS)
27 dnl
28 dnl Make our output files, being sure that we create the some miscellaneous
29 dnl directories
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/quotefix.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/quotefix.patch
deleted file mode 100644
index f260f034fa..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/quotefix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2Signed-off-by: Mei Lei <lei.mei@intel.com>
3
4
5These macros are underquoted and break with recent autoconf+automake
6combinations.
7
8RP 1/2/10
9
10Index: e2fsprogs-1.41.5/configure.in
11===================================================================
12--- e2fsprogs-1.41.5.orig/configure.in 2010-02-01 11:40:10.547790252 +0000
13+++ e2fsprogs-1.41.5/configure.in 2010-02-01 11:44:51.577876485 +0000
14@@ -397,11 +397,11 @@
15 AC_MSG_ERROR([pkg-config not installed; please install it.])
16 fi
17
18- AC_CHECK_LIB(blkid, blkid_get_cache,
19+ [AC_CHECK_LIB(blkid, blkid_get_cache,
20 [LIBBLKID=`$PKG_CONFIG --libs blkid`;
21 STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`],
22 [AC_MSG_ERROR([external blkid library not found])],
23- [$LIBBLKID])
24+ [$LIBBLKID])]
25 BLKID_CMT=#
26 AC_MSG_RESULT([Disabling private blkid library])
27 else
28@@ -786,15 +786,15 @@
29 dnl
30 SEM_INIT_LIB=''
31 AC_CHECK_FUNC(sem_init, ,
32- AC_CHECK_LIB(pthread, sem_init,
33+ [AC_CHECK_LIB(pthread, sem_init,
34 AC_DEFINE(HAVE_SEM_INIT)
35 SEM_INIT_LIB=-lpthread,
36- AC_CHECK_LIB(rt, sem_init,
37+ [AC_CHECK_LIB(rt, sem_init,
38 AC_DEFINE(HAVE_SEM_INIT)
39 SEM_INIT_LIB=-lrt,
40- AC_CHECK_LIB(posix4, sem_init,
41+ [AC_CHECK_LIB(posix4, sem_init,
42 AC_DEFINE(HAVE_SEM_INIT)
43- SEM_INIT_LIB=-lposix4))))dnl
44+ SEM_INIT_LIB=-lposix4)])])])dnl
45 AC_SUBST(SEM_INIT_LIB)
46 dnl
47 dnl Check for unified diff
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 20:12:52 +0000