diff options
| author | Andreas Grapentin <andreas@grapentin.org> | 2018-02-15 11:14:45 +0100 |
|---|---|---|
| committer | Andreas Grapentin <andreas@grapentin.org> | 2018-02-15 11:14:45 +0100 |
| commit | ae7a4e472e0f04bc00113192642b25d44ea41c85 (patch) | |
| tree | 8d78b870f1f927d6d769675cb563af19da2633ab | |
| parent | fa9f9cda350ec3b87b98458d7c43fde85cedd8d2 (diff) | |
now at mkinitcpio-busybox
| -rw-r--r-- | src/stage1/build_from_deptree.sh | 8 | ||||
| -rw-r--r-- | src/stage1/patches/zlib.patch | 48 |
2 files changed, 52 insertions, 4 deletions
diff --git a/src/stage1/build_from_deptree.sh b/src/stage1/build_from_deptree.sh index f285402..ca1444c 100644 --- a/src/stage1/build_from_deptree.sh +++ b/src/stage1/build_from_deptree.sh @@ -66,10 +66,10 @@ while [ -s "$_deptree" ]; do patch -Np1 -i "$_srcdir"/stage1/patches/$_pkgname.patch # substitute common variables - sed -i "s#@TARGET@#$_target#" PKGBUILD - sed -i "s#@ARCH@#$_arch#" PKGBUILD - sed -i "s#@LINUX_ARCH@#$_linux_arch#" PKGBUILD - sed -i "s#@CHROOTDIR@#$_chrootdir#" PKGBUILD + sed -i "s#@TARGET@#$_target#g" PKGBUILD + sed -i "s#@ARCH@#$_arch#g" PKGBUILD + sed -i "s#@LINUX_ARCH@#$_linux_arch#g" PKGBUILD + sed -i "s#@CHROOTDIR@#$_chrootdir#g" PKGBUILD # enable the target arch explicitly sed -i "s/arch=([^)]*/& $_arch/" PKGBUILD diff --git a/src/stage1/patches/zlib.patch b/src/stage1/patches/zlib.patch new file mode 100644 index 0000000..bcb986e --- /dev/null +++ b/src/stage1/patches/zlib.patch @@ -0,0 +1,48 @@ +--- a/PKGBUILD 2018-02-15 11:00:49.520175121 +0100 ++++ b/PKGBUILD 2018-02-15 11:07:05.186130556 +0100 +@@ -2,7 +2,7 @@ + # Maintainer: Pierre Schmitz <pierre@archlinux.de> + + pkgbase=zlib +-pkgname=(zlib minizip) ++pkgname=(zlib) + epoch=1 + pkgver=1.2.11 + pkgrel=2 +@@ -24,22 +24,12 @@ prepare() { + build() { + cd ${srcdir}/zlib-$pkgver + ./configure --prefix=/usr +- make +- +- cd contrib/minizip +- cp Makefile Makefile.orig +- cp ../README.contrib readme.txt +- autoreconf --install +- ./configure --prefix=/usr --enable-static=no +- make ++ make TARGETMACH=@TARGET@ CROSS=@TARGET@ CC=@TARGET@-gcc LD=@TARGET@-ld AS=@TARGET@-as + } + + check() { + cd ${srcdir}/zlib-$pkgver + make test +- +- cd contrib/minizip +- make -f Makefile.orig test + } + + package_zlib() { +@@ -49,12 +39,3 @@ package_zlib() { + make install DESTDIR=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/zlib/LICENSE + } +- +-package_minizip() { +- pkgdesc='Mini zip and unzip based on zlib' +- depends=('zlib') +- +- cd ${srcdir}/zlib-$pkgver/contrib/minizip +- make install DESTDIR=${pkgdir} +- install -D -m644 ${srcdir}/zlib-$pkgver/LICENSE ${pkgdir}/usr/share/licenses/minizip/LICENSE +-} |