summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--build_config.rb32
-rw-r--r--build_config.rb.patch13
4 files changed, 18 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6546a5485471..734fe2a3aabb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,10 +13,10 @@ pkgbase = mitamae
depends = pacman
source = https://github.com/k0kubun/mitamae/archive/v1.12.0.tar.gz
source = mruby-2.1.2.tar.gz::https://github.com/mruby/mruby/archive/2.1.2.tar.gz
- source = build_config.rb
+ source = build_config.rb.patch
sha512sums = 03cc824b04dc4f94b9eca56ae523c1a9be1fabbbb2c0b5caef776f782ccab802f68db24522ac202d8697b4f485d6016be3a4a6666f8d95a1cf5ab6a765151718
sha512sums = cbbb23dccda9d85ba6501d4dc94f634865b1a4c26f6a474468b09d5af54e9744c0d4b93454e20de3f8c7560e6c3dc6709bc34882dd16e25bd86abf710491575e
- sha512sums = 47f8cbe495a1a4f74207f41fc1000d50785516cf589d49d61a9f054c7315a037bb6e50c8c926949a51dd35677d1f109d0f2a396e13b19448e4f3a6a4281dc15e
+ sha512sums = 1b25aaf9e56812066c6003f3f7295c6949253c29f160d5903859cc14d471987f00196b0fc9c60da4f83e099e018dd9379b8703977f8f3faee3a34f1209f12ce5
pkgname = mitamae
diff --git a/PKGBUILD b/PKGBUILD
index f1824e4f084d..7cf78068d3ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,11 +12,12 @@ makedepends=('ruby-rake' 'git')
_mruby_revision=2.1.2
source=("https://github.com/k0kubun/${pkgname}/archive/v${pkgver}.tar.gz"
"mruby-${_mruby_revision}.tar.gz::https://github.com/mruby/mruby/archive/${_mruby_revision}.tar.gz"
- 'build_config.rb'
+ "build_config.rb.patch"
)
prepare() {
cd "$pkgname-$pkgver"
+ patch --strip=1 --input="${srcdir}/build_config.rb.patch"
tar xf "$srcdir/mruby-${_mruby_revision}.tar.gz"
mv "mruby-${_mruby_revision}" mruby
@@ -25,7 +26,6 @@ prepare() {
build() {
cd "$pkgname-$pkgver"
- cp "$srcdir/build_config.rb" .
rake compile
}
@@ -39,4 +39,4 @@ package() {
}
sha512sums=('03cc824b04dc4f94b9eca56ae523c1a9be1fabbbb2c0b5caef776f782ccab802f68db24522ac202d8697b4f485d6016be3a4a6666f8d95a1cf5ab6a765151718'
'cbbb23dccda9d85ba6501d4dc94f634865b1a4c26f6a474468b09d5af54e9744c0d4b93454e20de3f8c7560e6c3dc6709bc34882dd16e25bd86abf710491575e'
- '47f8cbe495a1a4f74207f41fc1000d50785516cf589d49d61a9f054c7315a037bb6e50c8c926949a51dd35677d1f109d0f2a396e13b19448e4f3a6a4281dc15e')
+ '1b25aaf9e56812066c6003f3f7295c6949253c29f160d5903859cc14d471987f00196b0fc9c60da4f83e099e018dd9379b8703977f8f3faee3a34f1209f12ce5')
diff --git a/build_config.rb b/build_config.rb
deleted file mode 100644
index 422c7dbd1717..000000000000
--- a/build_config.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-MRuby::Build.new do |conf|
- toolchain :gcc
-
- conf.gem __dir__
- conf.gem github: 'eagletmt/mitamae-pacman', checksum_hash: 'v0.2.0'
- conf.gem github: 'eagletmt/mitamae-secrets', checksum_hash: 'v0.1.1'
-
- conf.gem github: 'IceDragon200/mruby-catch-throw', checksum_hash: '2b6eaff4232b4a9473b864df53c2917080af5dcf' # Latest
- conf.gem github: 'eagletmt/mruby-etc', checksum_hash: 'v0.1.0' # Specified by mitamae
- conf.gem github: 'fastly/mruby-optparse', checksum_hash: 'e6397a090d1efe04d5dab57c63897f0d79bbad89' # Latest
- conf.gem github: 'gromnitsky/mruby-dir-glob', checksum_hash: '334c040a2e2c4c2689f8c3440168011f64d57ada' # Latest
- conf.gem github: 'iij/mruby-dir', checksum_hash: '89dceefa1250fb1ae868d4cb52498e9e24293cd1' # Latest
- conf.gem github: 'iij/mruby-env', checksum_hash: '056ae324451ef16a50c7887e117f0ea30921b71b' # Latest
- conf.gem github: 'iij/mruby-errno', checksum_hash: 'b4415207ff6ea62360619c89a1cff83259dc4db0' # Latest
- conf.gem github: 'iij/mruby-iijson', checksum_hash: 'c5e730c30090d3cddae258f57ab9508edb3e9fce' # Latest
- conf.gem github: 'iij/mruby-pack', checksum_hash: '383a9c79e191d524a9a2b4107cc5043ecbf6190b' # Latest
- conf.gem github: 'iij/mruby-process', checksum_hash: '95da206a5764f4e80146979b8e35bd7a9afd6850' # Latest
- conf.gem github: 'k0kubun/mruby-erb', checksum_hash: '978257e478633542c440c9248e8cdf33c5ad2074' # Specified by mitamae
- conf.gem github: 'k0kubun/mruby-hashie', checksum_hash: 'c69255a94debcd641f2087b569f5625509bde698' # Specified by mitamae
- conf.gem github: 'k0kubun/mruby-open3', checksum_hash: 'b2dba93fdbd60dcff8aa20b6c56014ac89d267ad' # Specified by mitamae
- conf.gem github: 'k0kubun/mruby-shellwords', checksum_hash: '2a284d99b2121615e43d6accdb0e4cde1868a0d8' # Specified by mitamae
- conf.gem github: 'k0kubun/mruby-specinfra', checksum_hash: '69fe4306e2b004baa9dd54d4fbf9262988ce7d03' # Specified by mitamae
- conf.gem github: 'k0kubun/mruby-tempfile', checksum_hash: 'e628c8fcb4bca3f3456640a8b56d1ae98c594e24' # Specified by mitamae
- conf.gem github: 'ksss/mruby-at_exit', checksum_hash: '09af1ecdce7b39582023c7614f8305386ee4d789' # Latest
- conf.gem github: 'ksss/mruby-file-stat', checksum_hash: '2d3ea9b5d59d2b41133228a71c110b75cb30a31e' # Specified by mitamae
- conf.gem github: 'ksss/mruby-singleton', checksum_hash: '73dd4bae1a47d82e49b8f85bf27f49ec4462052e' # Latest
- conf.gem github: 'mattn/mruby-json', checksum_hash: '054699892b0d681110e7348440cddb70a3fd671e' # Latest
- conf.gem github: 'mattn/mruby-onig-regexp', checksum_hash: 'e55923997ba33586b58c11bd3ca2d40c11a8dede' # Latest
- conf.gem github: 'mrbgems/mruby-yaml', checksum_hash: '0606652a6e99d902cd3101cf2d757a7c0c37a7fd' # Specified by mitamae
- conf.gem github: 'tatsushid/mruby-schash', checksum_hash: 'c8470d4be2404b4cfbb8011daebc2ca9bb1cdb80' # Latest
- conf.gem github: 'zzak/mruby-uri', checksum_hash: 'b3108ae56a48990eb7b79f44aca4ec76e1e60ad8' # Latest
-end
diff --git a/build_config.rb.patch b/build_config.rb.patch
new file mode 100644
index 000000000000..d3f1698549e0
--- /dev/null
+++ b/build_config.rb.patch
@@ -0,0 +1,13 @@
+diff --git a/build_config.rb b/build_config.rb
+index d5e7ea9..a5c8888 100644
+--- a/build_config.rb
++++ b/build_config.rb
+@@ -1,5 +1,8 @@
+ def gem_config(conf)
+ conf.gem File.expand_path(File.dirname(__FILE__))
++
++ conf.gem github: 'eagletmt/mitamae-pacman', checksum_hash: 'v0.2.0'
++ conf.gem github: 'eagletmt/mitamae-secrets', checksum_hash: 'v0.1.1'
+ end
+
+ def debug_config(conf)