Permalink
Browse files

Fix rubinius building

  • Loading branch information...
1 parent ff73ce4 commit b5610e2cefe1fff5a67b9f8d2cbebafcba40b205 @meh meh committed May 11, 2011
@@ -1,6 +1,5 @@
Package.define('rubinius') {
- avoid Modules::Building::Autotools
- use Modules::Building::Rake
+ use Building::Rake
tags 'application', 'interpreter', 'development', 'ruby'
@@ -18,31 +17,33 @@ Package.define('rubinius') {
Do.cd Dir.glob("#{workdir}/*").first
end
- before :compile do
- environment[:LD] = environment[:CXX]
- environment[:FAKEROOT] = distdir
-
- conf = Modules::Building::Autotools::Configuration.new
-
- conf.set 'prefix', (env[:INSTALL_PATH] + 'usr').cleanpath
- conf.set 'gemsdir', (env[:INSTALL_PATH] + 'usr/lib/ruby').cleanpath
- conf.set 'bindir', (env[:INSTALL_PATH] + 'usr/bin').cleanpath
- conf.set 'includedir', (env[:INSTALL_PATH] + 'usr/include/rubinius').cleanpath
- conf.set 'mandir', (env[:INSTALL_PATH] + 'usr/share').cleanpath
- conf.set 'libdir', (env[:INSTALL_PATH] + 'usr/lib/ruby').cleanpath
- conf.set 'sitedir', (env[:INSTALL_PATH] + 'usr/lib/ruby/rubinius/site').cleanpath
- conf.set 'vendordir', (env[:INSTALL_PATH] + 'usr/lib/ruby/rubinius/vendor').cleanpath
-
- Packo.sh "./configure #{conf}"
+ before :configure do |conf|
+ env[:LD] = env[:CXX]
+ env[:FAKEROOT] = distdir
+ env[:RUBYOPT] = '-rrubygems'
+ env[:CFLAGS] << '-Wno-error'
+
+ conf.set 'prefix', Path.clean(env[:INSTALL_PATH] + 'usr')
+ conf.set 'gemsdir', Path.clean(env[:INSTALL_PATH] + 'usr/lib/ruby')
+ conf.set 'bindir', Path.clean(env[:INSTALL_PATH] + 'usr/bin')
+ conf.set 'includedir', Path.clean(env[:INSTALL_PATH] + 'usr/include/rubinius')
+ conf.set 'mandir', Path.clean(env[:INSTALL_PATH] + 'usr/share')
+ conf.set 'libdir', Path.clean(env[:INSTALL_PATH] + 'usr/lib/ruby')
+ conf.set 'sitedir', Path.clean(env[:INSTALL_PATH] + 'usr/lib/ruby/rubinius/site')
+ conf.set 'vendordir', Path.clean(env[:INSTALL_PATH] + 'usr/lib/ruby/rubinius/vendor')
+
+ conf.execute
+ end
+ before :compile do |conf|
package.rake.do 'build'
throw :halt
end
after :install do
[:rake, :rdoc, :ruby, :ri, :gem, :irb].each {|file|
- Do.rm("#{distdir}/usr/bin/#{file}")
+ package.do.rm("/usr/bin/#{file}")
}
end
}
@@ -161,10 +161,10 @@ Package.define('bitlbee') {
package.autotools.make 'install-etc', "DESTDIR=#{package.distdir}"
end
- admin.do {|sys|
- sys.useradd :bitlbee, home: Path.clean(env[:INSTALL_PATH] + '/var/lib/bitlbee')
+ admin.do {
+ useradd :bitlbee, home: Path.clean(package.env[:INSTALL_PATH] + '/var/lib/bitlbee')
- sys.chown Path.clean(env[:INSTALL_PATH] + '/var/lib/bilbee'), user: :bitlbee, group: :bitlbee
- sys.chown Path.clean(env[:INSTALL_PATH] + '/var/run/bilbee'), user: :bitlbee, group: :bitlbee
+ chown Path.clean(package.env[:INSTALL_PATH] + '/var/lib/bilbee'), user: :bitlbee, group: :bitlbee
+ chown Path.clean(package.env[:INSTALL_PATH] + '/var/run/bilbee'), user: :bitlbee, group: :bitlbee
}
}
@@ -7,6 +7,8 @@ Package.define('sylpheed') {
maintainer 'meh. <meh@paranoici.org>'
+ source 'http://sylpheed.sraoss.jp/sylpheed/v#{package.version.major}.#{package.version.minor}/sylpheed-#{package.version}.tar.bz2'
+
dependencies << 'misc/mime-types' << 'misc/network/curl' << 'misc/x11/shared-mime-info'
features {
@@ -76,7 +78,8 @@ Package.define('sylpheed') {
}
before :configure do |conf|
- autotools.autoreconf
+ autotools.m4 = 'ac'
+ autotools.aclocal
htmldir = Path.clean("/usr/share/doc/sylpheed-#{package.version}")

0 comments on commit b5610e2

Please sign in to comment.