Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
aports
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
647
Issues
647
List
Boards
Labels
Service Desk
Milestones
Merge Requests
190
Merge Requests
190
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
aports
Commits
5ee85c4a
Commit
5ee85c4a
authored
May 27, 2019
by
Leo
Committed by
Natanael Copa
May 28, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
main/e2fsprogs: upgrade to 1.45.1
parent
97c5c7eb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
39 deletions
+2
-39
main/e2fsprogs/APKBUILD
main/e2fsprogs/APKBUILD
+2
-4
main/e2fsprogs/gnuc-prereq.patch
main/e2fsprogs/gnuc-prereq.patch
+0
-35
No files found.
main/e2fsprogs/APKBUILD
View file @
5ee85c4a
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname
=
e2fsprogs
pkgver
=
1.45.
0
pkgver
=
1.45.
1
pkgrel
=
0
pkgdesc
=
"Standard Ext2/3/4 filesystem utilities"
url
=
"http://e2fsprogs.sourceforge.net"
...
...
@@ -12,7 +12,6 @@ makedepends="$depends_dev linux-headers"
checkdepends
=
"diffutils perl"
subpackages
=
"
$pkgname
-static
$pkgname
-dev
$pkgname
-doc libcom_err
$pkgname
-libs
$pkgname
-extra"
source
=
"https://www.kernel.org/pub/linux/kernel/people/tytso/
$pkgname
/v
$pkgver
/
$pkgname
-
$pkgver
.tar.xz
gnuc-prereq.patch
"
build
()
{
...
...
@@ -83,5 +82,4 @@ static() {
mv
"
$pkgdir
"
/usr/lib/
*
.a
"
$subpkgdir
"
/usr/lib
}
sha512sums
=
"208f0508dd355f29f9428758123e84d7f73d1a0bba4fcdc5abb561dc492ed1ab7e36ce369acde5c26e9efff0b980d75047d2d5910d3e49614cc68ec770dc9014 e2fsprogs-1.45.0.tar.xz
155340b6fec21419fa9ca27ff1bd8e12f679013dd82f4dc0cd1feae2dbf143a942d6d4427a1e966e68fa37ecb282880ff5d07a3760ee8d6ac7f7c5e34a276735 gnuc-prereq.patch"
sha512sums
=
"2e8974d30e92d7f194ccad7f152b495d2a6e41328b1532351f13af27ceaef5ee01d52963e17801cc7317f7b5208791bd20c9028f15a9859225f0e64d175be779 e2fsprogs-1.45.1.tar.xz"
main/e2fsprogs/gnuc-prereq.patch
deleted
100644 → 0
View file @
97c5c7eb
diff --git a/lib/ext2fs/ext4_acl.h b/lib/ext2fs/ext4_acl.h
index 8d4d974..297df1b 100644
--- a/lib/ext2fs/ext4_acl.h
+++ b/lib/ext2fs/ext4_acl.h
@@ -1,3 +1,11 @@
+#ifndef __GNUC_PREREQ
+# if defined __GNUC__ && defined __GNUC_MINOR__
+# define __GNUC_PREREQ(maj, min) ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+# else
+# define __GNUC_PREREQ(maj, min) 0
+# endif
+#endif
+
/*
* Ext4's on-disk acl format. From linux/fs/ext4/acl.h
*/
diff --git a/lib/ext2fs/hashmap.h b/lib/ext2fs/hashmap.h
index 228f439..fdc8e7f 100644
--- a/lib/ext2fs/hashmap.h
+++ b/lib/ext2fs/hashmap.h
@@ -4,6 +4,14 @@
# include <stdlib.h>
# include <stdint.h>
+#ifndef __GNUC_PREREQ
+# if defined __GNUC__ && defined __GNUC_MINOR__
+# define __GNUC_PREREQ(maj, min) ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+# else
+# define __GNUC_PREREQ(maj, min) 0
+# endif
+#endif
+
struct ext2fs_hashmap {
uint32_t size;
uint32_t(*hash)(const void *key, size_t len);
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment