Patchwork [base] attr: Add 2.4.46

login
register
mail settings
Submitter Jacob Kjaergaard
Date Sept. 30, 2013, 11:38 a.m.
Message ID <1380541104-25572-1-git-send-email-jabk@prevas.dk>
Download mbox | patch
Permalink /patch/279131/
State Accepted
Delegated to: Esben Haabendal
Headers show

Comments

Jacob Kjaergaard - Sept. 30, 2013, 11:38 a.m.
From: Christian Sørensen <christian.braunersorensen@prevas.dk>

---
 recipes/attr/attr-2.4.46/configure-gettext.patch |   75 ++++++++++++++++++++++
 recipes/attr/attr_2.4.46.oe                      |    4 ++
 recipes/attr/attr_2.4.46.oe.sig                  |    1 +
 3 files changed, 80 insertions(+)
 create mode 100644 recipes/attr/attr-2.4.46/configure-gettext.patch
 create mode 100644 recipes/attr/attr_2.4.46.oe
 create mode 100644 recipes/attr/attr_2.4.46.oe.sig
Esben Haabendal - Oct. 14, 2013, 1:43 p.m.
Merged to master, thanks.

/Esben

Patch

diff --git a/recipes/attr/attr-2.4.46/configure-gettext.patch b/recipes/attr/attr-2.4.46/configure-gettext.patch
new file mode 100644
index 0000000..3611e20
--- /dev/null
+++ b/recipes/attr/attr-2.4.46/configure-gettext.patch
@@ -0,0 +1,75 @@ 
+diff -urN attr-2.4.44~orig/attr/Makefile attr-2.4.44/attr/Makefile
+--- attr-2.4.44~orig/attr/Makefile	2009-07-31 11:02:14.000000000 +0200
++++ attr-2.4.44/attr/Makefile	2013-04-29 11:59:31.262303499 +0200
+@@ -21,7 +21,7 @@
+ 
+ LTCOMMAND = attr
+ CFILES = attr.c
+-LLDLIBS = $(LIBATTR)
++LLDLIBS = $(LIBATTR) $(LIBINTL)
+ LTDEPENDENCIES = $(LIBATTR)
+ 
+ default: $(LTCOMMAND)
+diff -urN attr-2.4.44~orig/configure.in attr-2.4.44/configure.in
+--- attr-2.4.44~orig/configure.in	2009-07-31 11:02:14.000000000 +0200
++++ attr-2.4.44/configure.in	2013-04-29 12:00:51.143252989 +0200
+@@ -30,6 +30,24 @@
+ [ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],,
+ 	enable_gettext=yes)
+ AC_SUBST(enable_gettext)
++AS_IF([test "$enable_gettext" = "yes"],
++	[
++		AM_GNU_GETTEXT([external])
++		AS_IF([test "$USE_NLS" = "yes"], [],
++			[AC_MSG_ERROR([Gettext required but not found])])
++	], [LTLIBINTL="" ; AC_SUBST(LTLIBINTL)])
++
++AH_BOTTOM([
++#ifdef ENABLE_GETTEXT
++# include <libintl.h>
++# define _(x)			gettext(x)
++#else
++# define _(x)			(x)
++# define textdomain(d)		do { } while (0)
++# define bindtextdomain(d,dir)	do { } while (0)
++#endif
++#include <locale.h>
++])
+ 
+ AC_ARG_ENABLE(lib64,
+ [ --enable-lib64=[yes/no] Enable lib64 support [default=no]],,
+diff -urN attr-2.4.44~orig/getfattr/Makefile attr-2.4.44/getfattr/Makefile
+--- attr-2.4.44~orig/getfattr/Makefile	2009-07-31 11:02:14.000000000 +0200
++++ attr-2.4.44/getfattr/Makefile	2013-04-29 11:59:31.262303499 +0200
+@@ -22,7 +22,7 @@
+ LTCOMMAND = getfattr
+ CFILES = getfattr.c
+ 
+-LLDLIBS = $(LIBMISC) $(LIBATTR)
++LLDLIBS = $(LIBMISC) $(LIBATTR) $(LIBINTL)
+ LTDEPENDENCIES = $(LIBMISC) $(LIBATTR)
+ 
+ default: $(LTCOMMAND)
+diff -urN attr-2.4.44~orig/include/builddefs.in attr-2.4.44/include/builddefs.in
+--- attr-2.4.44~orig/include/builddefs.in	2009-07-31 11:02:14.000000000 +0200
++++ attr-2.4.44/include/builddefs.in	2013-04-29 11:59:31.262303499 +0200
+@@ -27,6 +27,7 @@
+ 
+ LIBATTR = $(TOPDIR)/libattr/libattr.la
+ LIBMISC = $(TOPDIR)/libmisc/libmisc.la
++LIBINTL = @LTLIBINTL@
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+diff -urN attr-2.4.44~orig/setfattr/Makefile attr-2.4.44/setfattr/Makefile
+--- attr-2.4.44~orig/setfattr/Makefile	2009-07-31 11:02:14.000000000 +0200
++++ attr-2.4.44/setfattr/Makefile	2013-04-29 11:59:31.266303252 +0200
+@@ -22,7 +22,7 @@
+ LTCOMMAND = setfattr
+ CFILES = setfattr.c
+ 
+-LLDLIBS = $(LIBMISC) $(LIBATTR)
++LLDLIBS = $(LIBMISC) $(LIBATTR) $(LIBINTL)
+ LTDEPENDENCIES = $(LIBMISC) $(LIBATTR)
+ 
+ default: $(LTCOMMAND)
diff --git a/recipes/attr/attr_2.4.46.oe b/recipes/attr/attr_2.4.46.oe
new file mode 100644
index 0000000..a7b7a24
--- /dev/null
+++ b/recipes/attr/attr_2.4.46.oe
@@ -0,0 +1,4 @@ 
+require ${PN}.inc
+
+inherit autotools-autoreconf
+SRC_URI += "file://configure-gettext.patch"
diff --git a/recipes/attr/attr_2.4.46.oe.sig b/recipes/attr/attr_2.4.46.oe.sig
new file mode 100644
index 0000000..6ac5c9e
--- /dev/null
+++ b/recipes/attr/attr_2.4.46.oe.sig
@@ -0,0 +1 @@ 
+835572a990537b7b1da71502dd7d2037b1467ed2  attr-2.4.46.src.tar.gz