Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools/e2fsprogs: fix building on a glibc 2.27 host #781

Closed
wants to merge 1 commit into from

Conversation

@pkgadd
Copy link
Contributor

pkgadd commented Mar 4, 2018

The e2fsprogs host build fails on a glibc 2.27 host with

make[6]: Entering directory 'build_dir/host/e2fsprogs-1.43.7/debugfs'
        CC create_inode.o
./../misc/create_inode.c:399:18: error: conflicting types for 'copy_file_range'
 static errcode_t copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file,
                  ^~~~~~~~~~~~~~~
In file included from ./../misc/create_inode.c:19:0:
/usr/include/unistd.h:1110:9: note: previous declaration of 'copy_file_range' was here
 ssize_t copy_file_range (int __infd, __off64_t *__pinoff,
         ^~~~~~~~~~~~~~~

Backport upstream commit "misc: rename copy_file_range to
copy_file_chunk" 01551bdba16ab16512a01affe02ade32c41ede8a in order to
fix this.

Signed-off-by: Stefan Lippers-Hollmann s.l-h@gmx.de

The e2fsprogs host build fails on a glibc 2.27 host with

make[6]: Entering directory 'build_dir/host/e2fsprogs-1.43.7/debugfs'
        CC create_inode.o
./../misc/create_inode.c:399:18: error: conflicting types for 'copy_file_range'
 static errcode_t copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file,
                  ^~~~~~~~~~~~~~~
In file included from ./../misc/create_inode.c:19:0:
/usr/include/unistd.h:1110:9: note: previous declaration of 'copy_file_range' was here
 ssize_t copy_file_range (int __infd, __off64_t *__pinoff,
         ^~~~~~~~~~~~~~~

Backport upstream commit "misc: rename copy_file_range to
copy_file_chunk" 01551bdba16ab16512a01affe02ade32c41ede8a in order to
fix this.

Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
@pkgadd pkgadd force-pushed the pkgadd:e2fsprogs-bugfixes-1 branch from 477b679 to b2d2c21 Mar 4, 2018
@hauke

This comment has been minimized.

Copy link
Member

hauke commented Mar 8, 2018

Is this also needed for lede 17.01?

@pkgadd

This comment has been minimized.

Copy link
Contributor Author

pkgadd commented Mar 8, 2018

Yes, it's also needed for lede-17.01 if you want to build it on a host with glibc >=2.27 (Debian/ unstable has switched to glibc 2.27-1 last saturday, it migrated to testing yesterday). The pull request applies (and compiles) without changes after leaving out or adapting the PKG_RELEASE bump for the stable backport.

@Ansuel

This comment has been minimized.

Copy link
Contributor

Ansuel commented Mar 9, 2018

why don't just upgrade the tool?

@Ansuel Ansuel referenced this pull request Mar 9, 2018
@pkgadd

This comment has been minimized.

Copy link
Contributor Author

pkgadd commented Mar 9, 2018

For the simple reason that e2fsprogs 1.44.0 has only been released about a day ago, while this pull request is four days old.

@hauke

This comment has been minimized.

Copy link
Member

hauke commented Mar 10, 2018

I applied pull request #791 to master and will apply this to lede-17.01

@hauke

This comment has been minimized.

Copy link
Member

hauke commented Mar 10, 2018

This was now applied to the lede-17.01 branch

@hauke hauke closed this Mar 10, 2018
dudanov added a commit to dudanov/source that referenced this pull request Oct 24, 2018
Just fix from [this](openwrt/openwrt#781) openwrt PR.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.