diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-11-02 17:51:32 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-11-02 17:51:32 +0200 |
| commit | 5e15740aac29817bd94fb66d5bb63dcb43005f36 (patch) | |
| tree | fd950f11bbea4c5e58ca269cbe76fbf7f2abb611 /main/seabios | |
| parent | e300694525500c8f7949424e4d56eba63e9cedd7 (diff) | |
| download | aports-5e15740aac29817bd94fb66d5bb63dcb43005f36.tar.bz2 aports-5e15740aac29817bd94fb66d5bb63dcb43005f36.tar.xz | |
main/seabios: fix gcc6 build
the way to disable gcc6's pie is different from esp patches.
update makefile to do the right thing.
Diffstat (limited to 'main/seabios')
| -rw-r--r-- | main/seabios/APKBUILD | 23 | ||||
| -rw-r--r-- | main/seabios/fix-pie.patch | 12 |
2 files changed, 21 insertions, 14 deletions
diff --git a/main/seabios/APKBUILD b/main/seabios/APKBUILD index 0a3691226e..d8689e3a03 100644 --- a/main/seabios/APKBUILD +++ b/main/seabios/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=seabios pkgver=1.9.2 -pkgrel=0 +pkgrel=1 pkgdesc="Open-source legacy BIOS implementation" url="http://www.coreboot.org/SeaBIOS" arch="x86 x86_64" @@ -12,6 +12,8 @@ makedepends="$depends_dev python2 iasl" install="" subpackages="$pkgname-bin:_seabios seavgabios-bin:_seavgabios" source="http://code.coreboot.org/p/seabios/downloads/get/seabios-$pkgver.tar.gz + fix-pie.patch + config.coreboot config.csm config.seabios-128k @@ -25,17 +27,7 @@ source="http://code.coreboot.org/p/seabios/downloads/get/seabios-$pkgver.tar.gz " _debug_level=1 -_builddir="$srcdir"/seabios-$pkgver -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} - +builddir="$srcdir"/seabios-$pkgver _build_bios() { msg "building $3" make clean distclean @@ -47,7 +39,7 @@ _build_bios() { } build() { - cd "$_builddir" + cd "$builddir" mkdir binaries || return 1 # seabois _build_bios "$srcdir"/config.csm Csm16.bin bios-csm.bin \ @@ -74,7 +66,7 @@ build() { } package() { - cd "$_builddir" + cd "$builddir" install -d "$pkgdir"/usr/share/seabios \ "$pkgdir"/usr/share/seavgabios for i in binaries/*; do @@ -104,6 +96,7 @@ _seavgabios() { } md5sums="32201f54c5fb478914d0bb2449b18454 seabios-1.9.2.tar.gz +7e18d418e3e10a4a8c6ab5ae4f205c80 fix-pie.patch e2e4c8e2bbc9e6250bccb7754e714534 config.coreboot 446b2e19edbd1db3bb30f550ce705838 config.csm 8e2ab836b50e93804098a7dd19023802 config.seabios-128k @@ -115,6 +108,7 @@ e2e4c8e2bbc9e6250bccb7754e714534 config.coreboot 7ea773f6b9bf5bdaaac2699403f185b3 config.vga.virtio c2d2b8d0f7b9024f9d157f8db100fec3 config.vga.vmware" sha256sums="f01d459b0e50996fdfa021eea5010776c26f739adba73957af519233165ebbe5 seabios-1.9.2.tar.gz +0961d04d80c160fcfe1eb6c051cec8ca1d2c47013cae7a1120a674ac757a0082 fix-pie.patch 562c285883d803b415fc5836367ae919ab34a6d09001a84970f464887a03fe2c config.coreboot a046a73392f449f106de918a82c51c99225212d9d253b9011475d0eaa41e6180 config.csm 5e4dbe993d4fd7cf4895e55fda55c65dcf4c86cdfe853e5df05c2c59624490a7 config.seabios-128k @@ -126,6 +120,7 @@ ca7367ae57665fa01e0ebb741ba5823d646f4b65a9a87657ea163cc9f362a8a8 config.vga.std afa7d59e1c18ed770cf0e83e3d5dc70866f75fdde83064fbea6e115f79504066 config.vga.virtio 1bd31f16dd43fb25aa92f9816cbfaae4a19a8faf29ff52bd02429fbaafb78f57 config.vga.vmware" sha512sums="ffd2db044e4ca42b3de4cea9bc8092840ac8b641169b0a6151b40a732f6f8cfd84a18716f086c36619debb911b95b3bd7f7a7dbdc79cd6b01aaa8ea2a9737325 seabios-1.9.2.tar.gz +bd25bfe842d9eb12052ecbed9f908e0991b743aafaea51a41c5fbf6a9e1ff85aef655fdef2d512a74bfc7dc1af3d7d19b6b6310265db46c27b27f26662602a7f fix-pie.patch dc77f693e2426a8a9b084f22d607d9bf6dfd0776cb86373a55d6e02f154f546b6fd616bb981783e914be51eb843311652a90b111fb573e32b3a8207d66aea218 config.coreboot a2238723fbbb96184bb52b018633701aeb929bfae43f50659258dee854acaf4f1bdf2c201c65fb46d2712372d11ab345eac1c41068f82d6dcbef91ef9d1d39cd config.csm fd9e323e2249cb5334ebe5f5e0badc3868edf254c9f8221f99cf1dcb9ef35b738739bc972185013743d1b3629e0f03fd309cee08f005fd280180652e5445550d config.seabios-128k diff --git a/main/seabios/fix-pie.patch b/main/seabios/fix-pie.patch new file mode 100644 index 0000000000..cb8b676ca4 --- /dev/null +++ b/main/seabios/fix-pie.patch @@ -0,0 +1,12 @@ +diff -ru seabios-1.9.2/Makefile seabios-1.9.2.fix/Makefile +--- seabios-1.9.2/Makefile 2016-03-07 16:19:08.000000000 +0200 ++++ seabios-1.9.2.fix/Makefile 2016-11-02 17:50:07.418748334 +0200 +@@ -62,7 +62,7 @@ + -minline-all-stringops -fomit-frame-pointer \ + -freg-struct-return -ffreestanding -fno-delete-null-pointer-checks \ + -ffunction-sections -fdata-sections -fno-common -fno-merge-constants +-COMMONCFLAGS += $(call cc-option,$(CC),-nopie,) ++COMMONCFLAGS += $(call cc-option,$(CC),-no-pie -fno-pic,) + COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) + COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,) + COMMONCFLAGS += $(call cc-option,$(CC),-fstack-check=no,) |