diff options
author | Ladislav Michl <ladis@linux-mips.org> | 2016-04-18 20:23:15 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-04-20 08:58:56 +0200 |
commit | f40ed8589c5158454453a95e6eb7296a15cacd5e (patch) | |
tree | 9e7d12dd620846ce5e127465d1299d81448c322a /patches | |
parent | b7e5593f6b3c594d62f534fa08b229cd926be1ec (diff) | |
download | ptxdist-f40ed8589c5158454453a95e6eb7296a15cacd5e.tar.gz ptxdist-f40ed8589c5158454453a95e6eb7296a15cacd5e.tar.xz |
acl: version bump 2.2.49 -> 2.2.52
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
[mol: regenerate patches with git-ptx-patches]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/acl-2.2.49/0003-buildmacros-fix-installation-of-static-libs.patch | 25 | ||||
-rw-r--r-- | patches/acl-2.2.49/series | 6 | ||||
-rw-r--r-- | patches/acl-2.2.52/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch (renamed from patches/acl-2.2.49/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch) | 11 | ||||
-rw-r--r-- | patches/acl-2.2.52/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch (renamed from patches/acl-2.2.49/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch) | 11 | ||||
-rw-r--r-- | patches/acl-2.2.52/0003-buildmacros-fix-install-with-user-domain.patch (renamed from patches/acl-2.2.49/0004-buildmacros-fix-install-with-user-domain.patch) | 11 | ||||
-rw-r--r-- | patches/acl-2.2.52/series | 6 |
6 files changed, 18 insertions, 52 deletions
diff --git a/patches/acl-2.2.49/0003-buildmacros-fix-installation-of-static-libs.patch b/patches/acl-2.2.49/0003-buildmacros-fix-installation-of-static-libs.patch deleted file mode 100644 index ac35a16fe..000000000 --- a/patches/acl-2.2.49/0003-buildmacros-fix-installation-of-static-libs.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Wed, 13 Jan 2010 15:33:11 +0100 -Subject: [PATCH] buildmacros: fix installation of static libs - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - include/buildmacros | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/include/buildmacros b/include/buildmacros -index 71ce471..d9b0734 100644 ---- a/include/buildmacros -+++ b/include/buildmacros -@@ -99,7 +99,7 @@ endif - INSTALL_LTLIB_STATIC = \ - cd $(TOPDIR)/$(LIBNAME)/.libs; \ - ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ -- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_DEVLIB_DIR) -+ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR) - - INSTALL_MAN = \ - @for d in $(MAN_PAGES); do \ --- -1.7.0.4 - diff --git a/patches/acl-2.2.49/series b/patches/acl-2.2.49/series deleted file mode 100644 index 8d3b58944..000000000 --- a/patches/acl-2.2.49/series +++ /dev/null @@ -1,6 +0,0 @@ -# generated by git-ptx-patches -0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch -0002-buildmacros-add-tag-CC-to-libtool-invocation.patch -0003-buildmacros-fix-installation-of-static-libs.patch -0004-buildmacros-fix-install-with-user-domain.patch -# 2eab836d9981c83ac12078b434b28788 - git-ptx-patches magic diff --git a/patches/acl-2.2.49/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch b/patches/acl-2.2.52/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch index c48cea0da..4be7388ac 100644 --- a/patches/acl-2.2.49/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch +++ b/patches/acl-2.2.52/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch @@ -4,11 +4,11 @@ Subject: [PATCH] builddefs: save C and CPPFLAGS from configure and use them Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- - include/builddefs.in | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + include/builddefs.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/builddefs.in b/include/builddefs.in -index d054a56..2fd0001 100644 +index 434ce9559e42..80789b062445 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -11,6 +11,8 @@ DEBUG = @debug_build@ @@ -20,7 +20,7 @@ index d054a56..2fd0001 100644 LIBACL = $(TOPDIR)/libacl/libacl.la LIBATTR = @libattr@ -@@ -84,7 +86,7 @@ GCFLAGS = $(OPTIMIZER) $(DEBUG) -funsigned-char -fno-strict-aliasing -Wall \ +@@ -85,7 +87,7 @@ GCFLAGS = $(OPTIMIZER) $(DEBUG) -funsigned-char -fno-strict-aliasing -Wall \ -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include # Global, Platform, Local CFLAGS @@ -29,6 +29,3 @@ index d054a56..2fd0001 100644 include $(TOPDIR)/include/buildmacros --- -1.7.0.4 - diff --git a/patches/acl-2.2.49/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch b/patches/acl-2.2.52/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch index f33f06499..7bb6811fe 100644 --- a/patches/acl-2.2.49/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch +++ b/patches/acl-2.2.52/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch @@ -4,14 +4,14 @@ Subject: [PATCH] buildmacros: add --tag=CC to libtool invocation Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- - include/buildmacros | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + include/buildmacros | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/buildmacros b/include/buildmacros -index ab89182..71ce471 100644 +index 9e81bb83d609..805ef64d8d57 100644 --- a/include/buildmacros +++ b/include/buildmacros -@@ -55,10 +55,10 @@ LIBNAME = $(basename $(LTLIBRARY)) +@@ -54,10 +54,10 @@ LIBNAME = $(basename $(LTLIBRARY)) LTOBJECTS = $(OBJECTS:.o=.lo) LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) @@ -24,6 +24,3 @@ index ab89182..71ce471 100644 ifeq ($(ENABLE_SHARED),yes) LTLDFLAGS += -rpath $(PKG_LIB_DIR) --- -1.7.0.4 - diff --git a/patches/acl-2.2.49/0004-buildmacros-fix-install-with-user-domain.patch b/patches/acl-2.2.52/0003-buildmacros-fix-install-with-user-domain.patch index 5c05ca7ff..dfa3c9593 100644 --- a/patches/acl-2.2.49/0004-buildmacros-fix-install-with-user-domain.patch +++ b/patches/acl-2.2.52/0003-buildmacros-fix-install-with-user-domain.patch @@ -9,11 +9,11 @@ Enclose "$(PKG_USER)" and "$(PKG_GROUP)" in quotes to fix. Signed-off-by: Jon Ringle <jon@ringle.org> --- - include/buildmacros | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + include/buildmacros | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/buildmacros b/include/buildmacros -index d9b0734..1eb61df 100644 +index 805ef64d8d57..29e937e077c8 100644 --- a/include/buildmacros +++ b/include/buildmacros @@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \ @@ -23,8 +23,5 @@ index d9b0734..1eb61df 100644 -INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP) +INSTALL = $(TOPDIR)/include/install-sh -o "$(PKG_USER)" -g "$(PKG_GROUP)" - SHELL = /bin/sh IMAGES_DIR = $(TOPDIR)/all-images --- -1.7.0.4 - + DIST_DIR = $(TOPDIR)/dist diff --git a/patches/acl-2.2.52/series b/patches/acl-2.2.52/series new file mode 100644 index 000000000..d07314253 --- /dev/null +++ b/patches/acl-2.2.52/series @@ -0,0 +1,6 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch +0002-buildmacros-add-tag-CC-to-libtool-invocation.patch +0003-buildmacros-fix-install-with-user-domain.patch +# 7f7779678dde859863b19dcae5e93fb1 - git-ptx-patches magic |