diff options
| author | Que Quotion | 2016-03-22 07:15:12 +0900 |
|---|---|---|
| committer | Que Quotion | 2016-03-22 07:15:12 +0900 |
| commit | 1ed9a24ddde518b9171393faff880c5f30a1f8bc (patch) | |
| tree | f8014a1b3967b2d7a7c808a5b95b242f226854c4 | |
| parent | 31b784945d3dcb8ff28a53ad1fc6faf16a4a2726 (diff) | |
| download | aur-1ed9a24ddde518b9171393faff880c5f30a1f8bc.tar.gz | |
Correcty assign system architechture and triple target for config.
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | makepkg.conf | 4 |
3 files changed, 12 insertions, 9 deletions
@@ -1,10 +1,11 @@ # Generated by mksrcinfo v8 -# Mon Mar 21 13:52:08 UTC 2016 +# Mon Mar 21 21:45:39 UTC 2016 pkgbase = makepkg-optimize pkgdesc = Additional package optimization routines for makepkg pkgver = 1 - pkgrel = 4 + pkgrel = 5 url = https://projects.archlinux.org/pacman.git/ + arch = i686 arch = x86_64 license = GPL makedepends = pacman @@ -39,7 +40,7 @@ pkgbase = makepkg-optimize sha512sums = dd609146c46b36bf3b9d7ed81935b64708cc5a37210f39e54162c603f1cae2bc9d8110dec92d61939c63245549b0a4548b17a15f9746abdd64faa65421288a2e sha512sums = b35f66b48912b1904c54205ea70e83a526790bb6e1424c4a2a4f11637f41fe6800effeb179284a3c73031fe2496ab5245e39e31d7e2eb400287b531d0ba89c97 sha512sums = 6df2ac2133f72ac2f3533fa9e3cc9337849dd5afbba2fd66b5d4d8b0b65a892c04771ceb6407eac357755fef87ac940d7848ccad915c387e465ad46b1ed496a3 - sha512sums = 1a147b4fdeaed571d6714af5443649e1f92512ef12bf3f66f77a13aa221318eff959f3c2fcbab4cb4196ebbf4ce33f8e6998f9bde0131b3c3b8a53f367dda31f + sha512sums = 201b66c83bf45f4d8c7e2c2464276731f4ae27b768746d77e60e5b81bf489c81386197241454d104d705ee14cec95a1ab0e5a920dbcf96e34c35795864193607 pkgname = makepkg-optimize @@ -2,9 +2,9 @@ pkgname=makepkg-optimize pkgver=1 -pkgrel=4 +pkgrel=5 pkgdesc='Additional package optimization routines for makepkg' -arch=('x86_64') +arch=('i686' 'x86_64') license=('GPL') url='https://projects.archlinux.org/pacman.git/' depends=('pacman' 'upx' 'optipng' 'nodejs-svgo') @@ -26,18 +26,20 @@ sha512sums=('67fb9359cd5dc52413ad2ca7e91b445826d7cf6b7ad3db0d2b3845310ab0bdfc41c 'dd609146c46b36bf3b9d7ed81935b64708cc5a37210f39e54162c603f1cae2bc9d8110dec92d61939c63245549b0a4548b17a15f9746abdd64faa65421288a2e' 'b35f66b48912b1904c54205ea70e83a526790bb6e1424c4a2a4f11637f41fe6800effeb179284a3c73031fe2496ab5245e39e31d7e2eb400287b531d0ba89c97' '6df2ac2133f72ac2f3533fa9e3cc9337849dd5afbba2fd66b5d4d8b0b65a892c04771ceb6407eac357755fef87ac940d7848ccad915c387e465ad46b1ed496a3' - '1a147b4fdeaed571d6714af5443649e1f92512ef12bf3f66f77a13aa221318eff959f3c2fcbab4cb4196ebbf4ce33f8e6998f9bde0131b3c3b8a53f367dda31f') + '201b66c83bf45f4d8c7e2c2464276731f4ae27b768746d77e60e5b81bf489c81386197241454d104d705ee14cec95a1ab0e5a920dbcf96e34c35795864193607') prepare() { # Use the user's currently installed versions of both #cp /usr/bin/makepkg ./makepkg-optimize #cp /etc/makepkg.conf ./makepkg-optimize.conf + # Replace with above after pacman update mkdir $pkgname cd $pkgname cp ../makepkg makepkg-optimize cp ../makepkg.conf makepkg-optimize.conf + sed -i "s|@ARCH@|"$(uname -m)"|g;s|@HOST@|"$(uname -m)\-$(uname -i)\-$OSTYPE"|g" makepkg-optimize.conf # Separate config file patch -Np0 < ../opticonf.patch @@ -60,7 +62,7 @@ package() { #Uncomment once dropped from pacman. #install -m755 ../optipng.sh $pkgdir/usr/share/makepkg/tidy/optipng.sh #install -m755 ../upx.sh $pkgdir/usr/share/makepkg/tidy/upx.sh - #install -m755 ../upx.sh $pkgdir/usr/share/makepkg/tidy/svgo.sh + install -m755 ../svgo.sh $pkgdir/usr/share/makepkg/tidy/svgo.sh mkdir -p $pkgdir/etc/ install -m644 makepkg-optimize.conf $pkgdir/etc/ } diff --git a/makepkg.conf b/makepkg.conf index 301d92b2b6f8..11dd9da3cc99 100644 --- a/makepkg.conf +++ b/makepkg.conf @@ -33,8 +33,8 @@ VCSCLIENTS=('bzr::bzr' # ARCHITECTURE, COMPILE FLAGS ######################################################################### # -CARCH="x86_64" -CHOST="x86_64-unknown-linux-gnu" +CARCH="@ARCH@" +CHOST="@HOST@" #-- Compiler and Linker Flags # -march (or -mcpu) builds exclusively for an architecture |