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/acl-2.2.52 | |
| 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/acl-2.2.52')
4 files changed, 90 insertions, 0 deletions
diff --git a/patches/acl-2.2.52/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 new file mode 100644 index 000000000..4be7388ac --- /dev/null +++ b/patches/acl-2.2.52/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch @@ -0,0 +1,31 @@ +From: Marc Kleine-Budde <mkl@pengutronix.de> +Date: Fri, 8 Jan 2010 20:10:08 +0100 +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 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/include/builddefs.in b/include/builddefs.in +index 434ce9559e42..80789b062445 100644 +--- a/include/builddefs.in ++++ b/include/builddefs.in +@@ -11,6 +11,8 @@ DEBUG = @debug_build@ + OPTIMIZER = @opt_build@ + MALLOCLIB = @malloc_lib@ + LOADERFLAGS = @LDFLAGS@ ++CFLAGS = @CFLAGS@ ++CPPFLAGS = @CPPFLAGS@ + + LIBACL = $(TOPDIR)/libacl/libacl.la + LIBATTR = @libattr@ +@@ -85,7 +87,7 @@ GCFLAGS = $(OPTIMIZER) $(DEBUG) -funsigned-char -fno-strict-aliasing -Wall \ + -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include + + # Global, Platform, Local CFLAGS +-CFLAGS += $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) ++CFLAGS += $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) $(CPPFLAGS) + + include $(TOPDIR)/include/buildmacros + diff --git a/patches/acl-2.2.52/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch b/patches/acl-2.2.52/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch new file mode 100644 index 000000000..7bb6811fe --- /dev/null +++ b/patches/acl-2.2.52/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch @@ -0,0 +1,26 @@ +From: Marc Kleine-Budde <mkl@pengutronix.de> +Date: Fri, 8 Jan 2010 20:10:56 +0100 +Subject: [PATCH] buildmacros: add --tag=CC to libtool invocation + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + include/buildmacros | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/buildmacros b/include/buildmacros +index 9e81bb83d609..805ef64d8d57 100644 +--- a/include/buildmacros ++++ b/include/buildmacros +@@ -54,10 +54,10 @@ LIBNAME = $(basename $(LTLIBRARY)) + LTOBJECTS = $(OBJECTS:.o=.lo) + LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + +-LTLINK = $(LIBTOOL) --mode=link $(CC) ++LTLINK = $(LIBTOOL) --tag=CC --mode=link $(CC) + LTEXEC = $(LIBTOOL) --mode=execute + LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) +-LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF) ++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CCF) + + ifeq ($(ENABLE_SHARED),yes) + LTLDFLAGS += -rpath $(PKG_LIB_DIR) diff --git a/patches/acl-2.2.52/0003-buildmacros-fix-install-with-user-domain.patch b/patches/acl-2.2.52/0003-buildmacros-fix-install-with-user-domain.patch new file mode 100644 index 000000000..dfa3c9593 --- /dev/null +++ b/patches/acl-2.2.52/0003-buildmacros-fix-install-with-user-domain.patch @@ -0,0 +1,27 @@ +From: Jon Ringle <jon@ringle.org> +Date: Mon, 23 May 2011 10:30:59 -0400 +Subject: [PATCH] buildmacros: fix install with user\domain + +If current user is domain\user the \ gets interpreted as an escape char +resulting in user not found. + +Enclose "$(PKG_USER)" and "$(PKG_GROUP)" in quotes to fix. + +Signed-off-by: Jon Ringle <jon@ringle.org> +--- + include/buildmacros | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/buildmacros b/include/buildmacros +index 805ef64d8d57..29e937e077c8 100644 +--- a/include/buildmacros ++++ b/include/buildmacros +@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \ + $(LFILES:.l=.o) \ + $(YFILES:%.y=%.tab.o) + +-INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP) ++INSTALL = $(TOPDIR)/include/install-sh -o "$(PKG_USER)" -g "$(PKG_GROUP)" + + IMAGES_DIR = $(TOPDIR)/all-images + 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 |