diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | buildenv_ext.conf | 2 | ||||
| -rw-r--r-- | pic.sh.in | 22 | ||||
| -rw-r--r-- | pie.sh.in | 22 |
5 files changed, 5 insertions, 57 deletions
@@ -1,7 +1,7 @@ pkgbase = makepkg-optimize pkgdesc = Supplemental build and packaging optimizations for makepkg pkgver = 10 - pkgrel = 1 + pkgrel = 2 url = https://wiki.archlinux.org/index.php/Makepkg-optimize arch = any license = GPL @@ -18,8 +18,6 @@ pkgbase = makepkg-optimize source = pgo.sh.in source = lto.sh.in source = graphite.sh.in - source = pic.sh.in - source = pie.sh.in source = upx-exec.sh.in source = optipng-exec.sh.in source = svgo-exec.sh.in @@ -40,8 +38,6 @@ pkgbase = makepkg-optimize sha1sums = 8f756d02ad1dae9dfbe79e414e557fe96e037549 sha1sums = 4078b286395e17bbcfbd14244ab48bbfce24988d sha1sums = 6b719a47146aedae186a7e63b6058507c4948d9f - sha1sums = ad330393c0d65fd50fa6503a8f68d264b774dae8 - sha1sums = a3143fe08aad1f95dc8ad37cd4f2987608808799 sha1sums = a079a302708342cc0549f56e2b5e17f483fbbbd1 sha1sums = e8358ced786a996a5763faa42f3541900b86647e sha1sums = 9c27d5cef8a12385b385b64e65fce39244e1be4b @@ -54,7 +50,7 @@ pkgbase = makepkg-optimize sha1sums = 202d11e49a611bb400029512cf159a0f8645a6db sha1sums = 2e2cd8c680a86518652543fda9092bf2ab594660 sha1sums = 981eab856abb43c5e093620cdf4d8bfa2d690805 - sha1sums = 48dfa865011051441aa3b1b261ac076948a40b98 + sha1sums = a2d4cc385d2395ec35094f63dc17847e73bbd565 sha1sums = 357102cec0aa56d74955bbf66ae694db74627dab sha1sums = 1fc8035e64b739e20c70fbb4eaa5cb7aa1c63c90 sha1sums = 5d0cde13b50641371e4ec4d813d6b2dfae493889 @@ -3,7 +3,7 @@ pkgname=makepkg-optimize pkgver=10 -pkgrel=1 +pkgrel=2 pkgdesc='Supplemental build and packaging optimizations for makepkg' arch=('any') license=('GPL') @@ -13,7 +13,7 @@ replaces=('makepkg-optimize2' pacman-buildenv_ext-git) depends=('pacman-git') optdepends=('upx' 'optipng' 'nodejs-svgo') backup=(etc/makepkg-optimize.conf) -_buildenv=({pgo,lto,graphite,pic,pie}.sh.in) +_buildenv=({pgo,lto,graphite}.sh.in) _executable=({upx,optipng,svgo}-exec.sh.in) _tidy=({upx,optipng,svgo}.sh.in) _conf=({{c,cxx,make,ld,debug-make,cmake-}flags,{buildenv,destdirs,pkgopts{,-param}}_ext,compress-param_max}.conf) @@ -25,8 +25,6 @@ source=(${_buildenv[@]} sha1sums=('8f756d02ad1dae9dfbe79e414e557fe96e037549' '4078b286395e17bbcfbd14244ab48bbfce24988d' '6b719a47146aedae186a7e63b6058507c4948d9f' - 'ad330393c0d65fd50fa6503a8f68d264b774dae8' - 'a3143fe08aad1f95dc8ad37cd4f2987608808799' 'a079a302708342cc0549f56e2b5e17f483fbbbd1' 'e8358ced786a996a5763faa42f3541900b86647e' '9c27d5cef8a12385b385b64e65fce39244e1be4b' @@ -39,7 +37,7 @@ sha1sums=('8f756d02ad1dae9dfbe79e414e557fe96e037549' '202d11e49a611bb400029512cf159a0f8645a6db' '2e2cd8c680a86518652543fda9092bf2ab594660' '981eab856abb43c5e093620cdf4d8bfa2d690805' - '48dfa865011051441aa3b1b261ac076948a40b98' + 'a2d4cc385d2395ec35094f63dc17847e73bbd565' '357102cec0aa56d74955bbf66ae694db74627dab' '1fc8035e64b739e20c70fbb4eaa5cb7aa1c63c90' '5d0cde13b50641371e4ec4d813d6b2dfae493889' diff --git a/buildenv_ext.conf b/buildenv_ext.conf index 7b254ca6adcf..500b7ef8d5c9 100644 --- a/buildenv_ext.conf +++ b/buildenv_ext.conf @@ -1,5 +1,3 @@ #-- lto: Use link-time optimization #-- pgo: Generate or utilize profile guided optimization #-- graphite: Use Graphite loop optimizations -#-- pic: Use address space layout randomization for shared libraries -#-- pie: Use address space layout randomization for executables diff --git a/pic.sh.in b/pic.sh.in deleted file mode 100644 index ff74a7902db0..000000000000 --- a/pic.sh.in +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/bash -# -# pic.sh - Compile shared libraries with address space layout randomization -# - -[[ -n "$LIBMAKEPKG_BUILDENV_PIC_SH" ]] && return -LIBMAKEPKG_BUILDENV_PIC_SH=1 - -LIBRARY=${LIBRARY:-'@libmakepkgdir@'} - -source "$LIBRARY/util/option.sh" - -build_options+=('pic') -buildenv_functions+=('buildenv_pic') - -buildenv_pic() { - if check_buildoption "pic" "y"; then - CFLAGS+=" -fpic" - CXXFLAGS+=" -fpic" - LDFLAGS+=" -shared" - fi -} diff --git a/pie.sh.in b/pie.sh.in deleted file mode 100644 index f97d4985ae45..000000000000 --- a/pie.sh.in +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/bash -# -# pie.sh - Compile executables with address space layout randomization -# - -[[ -n "$LIBMAKEPKG_BUILDENV_PIE_SH" ]] && return -LIBMAKEPKG_BUILDENV_PIE_SH=1 - -LIBRARY=${LIBRARY:-'@libmakepkgdir@'} - -source "$LIBRARY/util/option.sh" - -build_options+=('pie') -buildenv_functions+=('buildenv_pie') - -buildenv_pie() { - if check_buildoption "pie" "y"; then - CFLAGS+=" -fpie" - CXXFLAGS+=" -fpie" - LDFLAGS+=" -pie" - fi -} |