This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository jblas.
commit eb7ca8abb0132d8651ea7d9fdb8ad80d84c96553 Author: tony mancill <[email protected]> Date: Sat Jan 4 10:21:35 2014 -0800 ftbfs patch for ruby1.9+ --- debian/control | 2 +- debian/patches/build-with-ruby19.patch | 29 +++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 10 ++++++++-- 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index bc6d117..11e171c 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers <[email protected] Uploaders: Soeren Sonnenburg <[email protected]>, Torsten Werner <[email protected]> Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant-optional, gfortran, - libatlas-base-dev, ruby1.8 + libatlas-base-dev, ruby, locales Standards-Version: 3.9.3 Section: science Homepage: http://jblas.org diff --git a/debian/patches/build-with-ruby19.patch b/debian/patches/build-with-ruby19.patch new file mode 100644 index 0000000..eb6ba4f --- /dev/null +++ b/debian/patches/build-with-ruby19.patch @@ -0,0 +1,29 @@ +--- a/config/configure.rb ++++ b/config/configure.rb +@@ -32,6 +32,8 @@ + # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ## --- END LICENSE BLOCK --- + ++$: << "." ++ + require 'config/path' + require 'config/config' + require 'config/opts' +--- a/config/lib_helpers.rb ++++ b/config/lib_helpers.rb +@@ -64,7 +64,7 @@ + # returns an array of the symbols defined in the library +fn+. + def libsyms(fn) + nmopt = File.extname(fn) == '.so' ? '-D' : '' +- %x(#{Config::CONFIG['NM']} -p #{nmopt} #{fn.escape}).grep(/ T _?([a-zA-Z0-9_]+)/) {|m| $1} ++ %x(#{Config::CONFIG['NM']} -p #{nmopt} #{fn.escape}).lines.grep(/ T _?([a-zA-Z0-9_]+)/) {|m| $1} + end + + def locate_lib(libpath, name, symbol=nil) +@@ -163,4 +163,4 @@ + Config::CONFIG['BUILD_TYPE'] = 'static' + Config::CONFIG['OS_NAME'] = 'Linux' + p find_libs(paths, libs, symbols_needed) +-end +\ No newline at end of file ++end diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..38a6255 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +build-with-ruby19.patch diff --git a/debian/rules b/debian/rules index 00e2935..5c62072 100755 --- a/debian/rules +++ b/debian/rules @@ -14,8 +14,14 @@ clean:: debian/stamp-ant-build: debian/stamp-jblas-build debian/stamp-jblas-build: - ./configure --libpath=/usr/lib:/usr/lib/atlas - make + mkdir -p debian/tmp/locale/ + localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/ + export LOCPATH=$(CURDIR)/debian/tmp/locale/ && \ + export LC_ALL=en_US.UTF-8 && \ + ./configure --libpath=/usr/lib:/usr/lib/atlas + export LOCPATH=$(CURDIR)/debian/tmp/locale/ && \ + export LC_ALL=en_US.UTF-8 && \ + make touch $@ install/jblas:: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jblas.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
