Tobias Powalowski pushed to branch main at Arch Linux / Packaging / Packages / 
cpio


Commits:
6a1567ed by Daniel Tobias at 2025-07-02T00:06:37+10:00
use git submodules for gnulib and paxutils

- - - - -
a9032b96 by Daniel Tobias at 2025-07-02T00:15:22+10:00
drop no longer required CFLAGS workaround

- - - - -
233d9caf by Daniel Tobias at 2025-07-02T00:18:57+10:00
fix c23 conformity

- - - - -
3d46a9ab by Daniel Tobias at 2025-07-02T00:34:22+10:00
use configure option to not build rmt instead

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -9,8 +9,13 @@ pkgbase = cpio
        makedepends = rsync
        makedepends = wget
        depends = glibc
+       options = !emptydirs
        source = git+https://git.savannah.gnu.org/git/cpio.git?signed#tag=v2.15
+       source = git+https://git.savannah.gnu.org/git/gnulib.git
+       source = git+https://git.savannah.gnu.org/git/paxutils.git
        validpgpkeys = 325F650C4C2B6AD58807327A3602B07F55D0C732
+       b2sums = 
a440520f0cb0d77cff6fc8a44b13f32454a1052ce1d79a4733ebeaafcc0af3404a906edf0aecbc86c69b95b4b55005f63c20746f688672223bd751054f378a99
+       b2sums = SKIP
        b2sums = SKIP
 
 pkgname = cpio


=====================================
PKGBUILD
=====================================
@@ -9,19 +9,32 @@ license=('GPL-3.0-or-later')
 url="https://www.gnu.org/software/cpio";
 depends=('glibc')
 makedepends=('git' 'rsync' 'wget')
-source=(git+https://git.savannah.gnu.org/git/cpio.git?signed#tag=v${pkgver})
-b2sums=('SKIP')
+options=('!emptydirs')
+source=("git+https://git.savannah.gnu.org/git/cpio.git?signed#tag=v${pkgver}";
+        "git+https://git.savannah.gnu.org/git/gnulib.git";
+        "git+https://git.savannah.gnu.org/git/paxutils.git";)
 validpgpkeys=('325F650C4C2B6AD58807327A3602B07F55D0C732') # Sergey Poznyakoff 
<[email protected]>
+b2sums=('a440520f0cb0d77cff6fc8a44b13f32454a1052ce1d79a4733ebeaafcc0af3404a906edf0aecbc86c69b95b4b55005f63c20746f688672223bd751054f378a99'
+        'SKIP'
+        'SKIP')
 
 prepare() {
   cd "${pkgname}"
+
+  git submodule init
+  git config submodule.gnulib.url "${srcdir}/gnulib"
+  git config submodule.paxutils.url "${srcdir}/paxutils"
+  git -c protocol.file.allow=always submodule update
+
+  #fix c23 conformity 
https://cgit.git.savannah.gnu.org/cgit/cpio.git/commit/?id=f42137f5ab9cf07d1e62edc05e0212688d3ebaa2
+  git cherry-pick -n 'f42137f5ab9cf07d1e62edc05e0212688d3ebaa2'
+
   ./bootstrap
 }
 
 build() {
   cd "${pkgname}"
-  CFLAGS+=' -fcommon' # 
https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  ./configure --prefix=/usr --mandir=/usr/share/man --with-rmt=/dev/null
   make
 }
 
@@ -33,6 +46,4 @@ check() {
 package() {
   cd "${pkgname}"
   make DESTDIR="${pkgdir}" install
-  rm -r "${pkgdir}"/usr/libexec
-  rm -r "${pkgdir}"/usr/share/man/man8
 }



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/cpio/-/compare/7889897e70c4dfef95d4f38c06495bbcb039dac7...3d46a9abd2490af7afb4d7cccb0b9fb26708b367

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/cpio/-/compare/7889897e70c4dfef95d4f38c06495bbcb039dac7...3d46a9abd2490af7afb4d7cccb0b9fb26708b367
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to