diff options
Diffstat (limited to 'package/ruby')
| -rw-r--r-- | package/ruby/Makefile | 24 | ||||
| -rw-r--r-- | package/ruby/patches/patch-Makefile_in | 11 | ||||
| -rw-r--r-- | package/ruby/patches/patch-configure | 11 |
3 files changed, 10 insertions, 36 deletions
diff --git a/package/ruby/Makefile b/package/ruby/Makefile index 4afec030e..d8d5f061a 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -4,14 +4,14 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ruby -PKG_VERSION:= 1.9.2 -PKG_EXTRAVER:= 180 +PKG_VERSION:= 1.9.3 +PKG_EXTRAVER:= 0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 0d6953820c9918820dd916e79f4bfde8 +PKG_MD5SUM:= 8e2fef56185cfbaf29d0c8329fc77c05 PKG_DESCR:= interpreter for the ruby language PKG_SECTION:= lang PKG_URL:= http://www.ruby-lang.org/ -PKG_SITES:= ftp://ftp.ruby-lang.org/pub/ruby/ +PKG_SITES:= http://ftp.ruby-lang.org/pub/ruby/1.9/ PKG_NOPARALLEL:= 1 PKG_HOST_DEPENDS:= !freebsd !cygwin @@ -24,23 +24,19 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,RUBY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) MAKE_FILE:= GNUmakefile -XAKE_FLAGS+= optflags='' debugflags='' BASERUBY="${WRKBUILD}/hostruby" \ - dldflags="$(TARGET_LDFLAGS)" +XAKE_FLAGS+= optflags='' debugflags='' dldflags="$(TARGET_LDFLAGS)" # uClibc setpgrp does not take arguments -CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes -CONFIGURE_ARGS+= --disable-install-doc +CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes rb_cv_binary_elf=yes +CONFIGURE_ARGS+= --disable-install-doc --with-baseruby=${STAGING_DIR}/bin/ruby ALL_TARGET:= main INSTALL_TARGET:= install-nodoc pre-configure: - cp ${WRKBUILD}/ext/Setup ${WRKBUILD}/ext/Setup.orig - echo "option nodynamic" >> ${WRKBUILD}/ext/Setup (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ - ./configure --prefix=$(STAGING_HOST_DIR) --disable-install-doc \ + rb_cv_binary_elf=yes ./configure --prefix=$(STAGING_HOST_DIR) --disable-install-doc \ ); - $(MAKE) -C ${WRKBUILD} main - cp ${WRKBUILD}/ruby ${WRKBUILD}/hostruby - cp ${WRKBUILD}/ext/Setup.orig ${WRKBUILD}/ext/Setup + -$(MAKE) -C ${WRKBUILD} main Q="" + cp ${WRKBUILD}/ruby ${STAGING_DIR}/bin/ruby $(MAKE) -C ${WRKBUILD} install-nodoc $(MAKE) -C ${WRKBUILD} clean diff --git a/package/ruby/patches/patch-Makefile_in b/package/ruby/patches/patch-Makefile_in deleted file mode 100644 index e97548bc2..000000000 --- a/package/ruby/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- ruby-1.9.2-p0.orig/Makefile.in 2010-07-11 08:15:13.000000000 +0200 -+++ ruby-1.9.2-p0/Makefile.in 2011-01-16 22:34:17.000000000 +0100 -@@ -157,7 +157,7 @@ $(LIBRUBY_A): - - $(LIBRUBY_SO): - @-$(PRE_LIBRUBY_UPDATE) -- $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@ -+ $(LDSHARED) $(LDFLAGS) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@ - -$(OBJCOPY) -w -L '@EXPORT_PREFIX@Init_*' -L '@EXPORT_PREFIX@*_threadptr_*' $@ - @-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \ - File.symlink "$(LIBRUBY_SO)", link}' \ diff --git a/package/ruby/patches/patch-configure b/package/ruby/patches/patch-configure deleted file mode 100644 index efd25b6ff..000000000 --- a/package/ruby/patches/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- ruby-1.9.2-p0.orig/configure 2010-08-18 07:56:27.000000000 +0200 -+++ ruby-1.9.2-p0/configure 2010-11-08 18:00:26.561241080 +0100 -@@ -15431,7 +15431,7 @@ esac - esac - fi - if test "$enable_rpath" = yes; then -- LIBRUBY_RPATHFLAGS="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir)" -+ LIBRUBY_RPATHFLAGS="${linker_flag}-R ${linker_flag}\$(libdir)" - LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" - LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC" - fi |