summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuflosi2021-10-05 00:37:07 +0200
committerLuflosi2021-10-05 00:42:35 +0200
commitc3da4488345d720776050f6a562e718d238589fb (patch)
tree94f6401ead5aa2bffdf8ce814a8d2b5b32c98106
parentc24a2875f89073112532c8196139fd5f7e3daca7 (diff)
downloadaur-c3da4488345d720776050f6a562e718d238589fb.tar.gz
Remove patch which is no longer needed
I upstreamed it in https://github.com/linux-apfs/apfsprogs/pull/6.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD3
-rw-r--r--add-ldflags.patch26
3 files changed, 0 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f033f7733274..bcdd48abcd11 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,10 +10,8 @@ pkgbase = apfsprogs-git
provides = apfsprogs=r345.5efac5a
conflicts = apfsprogs
source = git+https://github.com/eafer/apfsprogs
- source = add-ldflags.patch
source = destdir.patch
sha256sums = SKIP
- sha256sums = 30c173d08a6ceeb40ba09f267f3bbacc1486fa51e155fef17456da03bd35d741
sha256sums = 65c7af8a2538536bcf9e62b152893849b2cd1092040f5bc6ec2a33040027f8ac
pkgname = apfsprogs-git
diff --git a/PKGBUILD b/PKGBUILD
index 93055c318411..27229ef178c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,10 +13,8 @@ makedepends=('git')
conflicts=("$_pkgname")
provides=("$_pkgname=$pkgver")
source=('git+https://github.com/eafer/apfsprogs'
- 'add-ldflags.patch'
'destdir.patch')
sha256sums=('SKIP'
- '30c173d08a6ceeb40ba09f267f3bbacc1486fa51e155fef17456da03bd35d741'
'65c7af8a2538536bcf9e62b152893849b2cd1092040f5bc6ec2a33040027f8ac')
_progs=(apfsck mkapfs)
@@ -28,7 +26,6 @@ pkgver() {
prepare() {
cd $_pkgname
- patch -Np1 -i ../add-ldflags.patch
patch -Np1 -i ../destdir.patch
}
diff --git a/add-ldflags.patch b/add-ldflags.patch
deleted file mode 100644
index 58da2f5dac61..000000000000
--- a/add-ldflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/apfsck/Makefile b/apfsck/Makefile
-index e6d6f84..6f65668 100644
---- a/apfsck/Makefile
-+++ b/apfsck/Makefile
-@@ -15,7 +15,7 @@ override CFLAGS += -Wall -I$(CURDIR)/../include
-
- apfsck: $(OBJS) $(LIBRARY)
- @echo ' Linking...'
-- @gcc $(CFLAGS) -o apfsck $(OBJS) $(LIBRARY)
-+ @gcc $(CFLAGS) $(LDFLAGS) -o apfsck $(OBJS) $(LIBRARY)
- @echo ' Build complete'
-
- # Build the common libraries
-diff --git a/mkapfs/Makefile b/mkapfs/Makefile
-index 67b39ab..2280615 100644
---- a/mkapfs/Makefile
-+++ b/mkapfs/Makefile
-@@ -14,7 +14,7 @@ override CFLAGS += -Wall -I$(CURDIR)/../include
-
- mkapfs: $(OBJS) $(LIBRARY)
- @echo ' Linking...'
-- @gcc $(CFLAGS) -o mkapfs $(OBJS) $(LIBRARY)
-+ @gcc $(CFLAGS) $(LDFLAGS) -o mkapfs $(OBJS) $(LIBRARY)
- @echo ' Build complete'
-
- # Build the common libraries