| Message ID | 20190506215718.14886-1-rosenp@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Hauke Mehrtens |
| Headers | show |
| Series | [OpenWrt-Devel] xfsprogs: Replace valloc with posix_memalign | expand |
On Mon, May 6, 2019 at 2:57 PM Rosen Penev <rosenp@gmail.com> wrote: > > Fixes compilation under uClibc-ng. > > Signed-off-by: Rosen Penev <rosenp@gmail.com> Can this also be backported to 18.06? It's failing there as well: https://downloads.openwrt.org/releases/faillogs-18.06/arc_arc700/base/xfsprogs/compile.txt > --- > package/utils/xfsprogs/Makefile | 2 +- > ...six_memalign-instead-of-deprecated-v.patch | 31 +++++++++++++++++++ > 2 files changed, 32 insertions(+), 1 deletion(-) > create mode 100644 package/utils/xfsprogs/patches/130-db-malloc-Use-posix_memalign-instead-of-deprecated-v.patch > > diff --git a/package/utils/xfsprogs/Makefile b/package/utils/xfsprogs/Makefile > index 50a5147b04..353773840a 100644 > --- a/package/utils/xfsprogs/Makefile > +++ b/package/utils/xfsprogs/Makefile > @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk > > PKG_NAME:=xfsprogs > PKG_CPE_ID:=cpe:/a:sgi:xfsprogs > -PKG_RELEASE:=2 > +PKG_RELEASE:=3 > PKG_VERSION:=4.11.0 > PKG_SOURCE_URL:=@KERNEL/linux/utils/fs/xfs/xfsprogs > PKG_HASH:=c3a6d87b564d7738243c507df82276bed982265e345363a95f2c764e8a5f5bb2 > diff --git a/package/utils/xfsprogs/patches/130-db-malloc-Use-posix_memalign-instead-of-deprecated-v.patch b/package/utils/xfsprogs/patches/130-db-malloc-Use-posix_memalign-instead-of-deprecated-v.patch > new file mode 100644 > index 0000000000..7bf1c77a40 > --- /dev/null > +++ b/package/utils/xfsprogs/patches/130-db-malloc-Use-posix_memalign-instead-of-deprecated-v.patch > @@ -0,0 +1,31 @@ > +From 930f9aa8f08759fa739dd6e615ba8b3a1890008d Mon Sep 17 00:00:00 2001 > +From: Rosen Penev <rosenp@gmail.com> > +Date: Mon, 6 May 2019 13:56:13 -0700 > +Subject: [PATCH] db/malloc: Use posix_memalign instead of deprecated valloc > + > +valloc is not available with uClibc-ng as well as being deprecated, which > +causes compilation errors. aligned_alloc is not available before C11 so > +used posix_memalign.' > + > +Signed-off-by: Rosen Penev <rosenp@gmail.com> > +--- > + db/malloc.c | 3 +-- > + 1 file changed, 1 insertion(+), 2 deletions(-) > + > +diff --git a/db/malloc.c b/db/malloc.c > +index 77b3e022..38fe0b05 100644 > +--- a/db/malloc.c > ++++ b/db/malloc.c > +@@ -56,8 +56,7 @@ xmalloc( > + { > + void *ptr; > + > +- ptr = valloc(size); > +- if (ptr) > ++ if(!posix_memalign(&ptr, sysconf(_SC_PAGESIZE), size)) > + return ptr; > + badmalloc(); > + /* NOTREACHED */ > +-- > +2.17.1 > + > -- > 2.17.1 >
diff --git a/package/utils/xfsprogs/Makefile b/package/utils/xfsprogs/Makefile index 50a5147b04..353773840a 100644 --- a/package/utils/xfsprogs/Makefile +++ b/package/utils/xfsprogs/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xfsprogs PKG_CPE_ID:=cpe:/a:sgi:xfsprogs -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_VERSION:=4.11.0 PKG_SOURCE_URL:=@KERNEL/linux/utils/fs/xfs/xfsprogs PKG_HASH:=c3a6d87b564d7738243c507df82276bed982265e345363a95f2c764e8a5f5bb2 diff --git a/package/utils/xfsprogs/patches/130-db-malloc-Use-posix_memalign-instead-of-deprecated-v.patch b/package/utils/xfsprogs/patches/130-db-malloc-Use-posix_memalign-instead-of-deprecated-v.patch new file mode 100644 index 0000000000..7bf1c77a40 --- /dev/null +++ b/package/utils/xfsprogs/patches/130-db-malloc-Use-posix_memalign-instead-of-deprecated-v.patch @@ -0,0 +1,31 @@ +From 930f9aa8f08759fa739dd6e615ba8b3a1890008d Mon Sep 17 00:00:00 2001 +From: Rosen Penev <rosenp@gmail.com> +Date: Mon, 6 May 2019 13:56:13 -0700 +Subject: [PATCH] db/malloc: Use posix_memalign instead of deprecated valloc + +valloc is not available with uClibc-ng as well as being deprecated, which +causes compilation errors. aligned_alloc is not available before C11 so +used posix_memalign.' + +Signed-off-by: Rosen Penev <rosenp@gmail.com> +--- + db/malloc.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/db/malloc.c b/db/malloc.c +index 77b3e022..38fe0b05 100644 +--- a/db/malloc.c ++++ b/db/malloc.c +@@ -56,8 +56,7 @@ xmalloc( + { + void *ptr; + +- ptr = valloc(size); +- if (ptr) ++ if(!posix_memalign(&ptr, sysconf(_SC_PAGESIZE), size)) + return ptr; + badmalloc(); + /* NOTREACHED */ +-- +2.17.1 +
Fixes compilation under uClibc-ng. Signed-off-by: Rosen Penev <rosenp@gmail.com> --- package/utils/xfsprogs/Makefile | 2 +- ...six_memalign-instead-of-deprecated-v.patch | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 package/utils/xfsprogs/patches/130-db-malloc-Use-posix_memalign-instead-of-deprecated-v.patch