From fdb9a5d0000df40e477ed563e1e779080e85e66e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 8 Nov 2010 18:29:25 +0100 Subject: update and fix module building, explicit install files --- package/ruby/Makefile | 20 +++++++++------ package/ruby/patches/patch-Makefile_in | 15 +++++------ package/ruby/patches/patch-common_mk | 11 -------- package/ruby/patches/patch-configure | 11 ++++++++ package/ruby/patches/patch-ext_openssl_ossl_c | 29 ---------------------- package/ruby/patches/patch-ext_openssl_ossl_h | 19 -------------- .../ruby/patches/patch-ext_openssl_ossl_pkcs7_c | 12 --------- 7 files changed, 29 insertions(+), 88 deletions(-) delete mode 100644 package/ruby/patches/patch-common_mk create mode 100644 package/ruby/patches/patch-configure delete mode 100644 package/ruby/patches/patch-ext_openssl_ossl_c delete mode 100644 package/ruby/patches/patch-ext_openssl_ossl_h delete mode 100644 package/ruby/patches/patch-ext_openssl_ossl_pkcs7_c (limited to 'package/ruby') diff --git a/package/ruby/Makefile b/package/ruby/Makefile index f956be9dc..755c20ebc 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ruby -PKG_VERSION:= 1.9.1 +PKG_VERSION:= 1.9.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 0f6d7630f26042e00bc59875755cf879 +PKG_MD5SUM:= 755aba44607c580fddc25e7c89260460 PKG_DESCR:= interpreter for the ruby language PKG_SECTION:= lang PKG_URL:= http://www.ruby-lang.org/ @@ -15,8 +15,8 @@ PKG_NOPARALLEL:= 1 PKG_HOST_DEPENDS:= !freebsd !cygwin !darwin -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-p429.tar.gz -WRKDIST= ${WRKDIR}/${PKG_NAME}-1.9.1-p429 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-p0.tar.gz +WRKDIST= ${WRKDIR}/${PKG_NAME}-1.9.2-p0 include ${TOPDIR}/mk/package.mk @@ -26,13 +26,15 @@ MAKE_FILE:= GNUmakefile XAKE_FLAGS+= optflags='' debugflags='' BASERUBY="${WRKBUILD}/hostruby" # uClibc setpgrp does not take arguments CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes +CONFIGURE_ARGS+= --disable-install-doc +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_TOOLS) \ + ./configure --prefix=$(STAGING_TOOLS) --disable-install-doc \ ); $(MAKE) -C ${WRKBUILD} ruby cp ${WRKBUILD}/ruby ${WRKBUILD}/hostruby @@ -41,8 +43,10 @@ pre-configure: $(MAKE) -C ${WRKBUILD} clean post-install: - rm -rf ${WRKINST}/usr/lib/site_ruby - rm -rf ${WRKINST}/usr/include - ${CP} ${WRKINST}/usr ${IDIR_RUBY}/ + ${INSTALL_DIR} ${IDIR_RUBY}/usr/lib/ruby + ${INSTALL_DIR} ${IDIR_RUBY}/usr/bin + ${CP} ${WRKINST}/usr/lib/libruby.so* ${IDIR_RUBY}/usr/lib + ${CP} ${WRKINST}/usr/lib/ruby/* ${IDIR_RUBY}/usr/lib/ruby/ + ${INSTALL_BIN} ${WRKINST}/usr/bin/* ${IDIR_RUBY}/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ruby/patches/patch-Makefile_in b/package/ruby/patches/patch-Makefile_in index 992921e8c..6c71409cd 100644 --- a/package/ruby/patches/patch-Makefile_in +++ b/package/ruby/patches/patch-Makefile_in @@ -1,11 +1,8 @@ ---- ruby-1.9.1-p378.orig/Makefile.in 2009-11-12 17:01:28.000000000 +0100 -+++ ruby-1.9.1-p378/Makefile.in 2010-06-02 20:50:05.821613650 +0200 -@@ -274,7 +274,7 @@ INSNS = opt_sc.inc optinsn.inc optunifs. - - $(INSNS): - @$(RM) $(PROGRAM) +--- ruby-1.9.2-p0.orig/Makefile.in 2010-07-11 08:15:13.000000000 +0200 ++++ ruby-1.9.2-p0/Makefile.in 2010-11-08 16:53:07.774995217 +0100 +@@ -315,4 +315,4 @@ INSNS = opt_sc.inc optinsn.inc optunifs. + $(INSNS): $(srcdir)/insns.def vm_opts.h \ + $(srcdir)/defs/opt_operand.def $(srcdir)/defs/opt_insn_unif.def \ + $(srcdir)/tool/instruction.rb $(srcdir)/tool/insns2vm.rb - $(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ + $(BASERUBY) $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ - - node_name.inc: - $(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@ diff --git a/package/ruby/patches/patch-common_mk b/package/ruby/patches/patch-common_mk deleted file mode 100644 index 80870ae97..000000000 --- a/package/ruby/patches/patch-common_mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ruby-1.9.1-p378.orig/common.mk 2009-11-12 17:01:28.000000000 +0100 -+++ ruby-1.9.1-p378/common.mk 2010-06-02 20:50:05.701612890 +0200 -@@ -400,7 +400,7 @@ extconf: $(PREP) - $(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS) - - $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP) -- @$(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \ -+ $(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \ - -install_name=$(RUBY_INSTALL_NAME) \ - -so_name=$(RUBY_SO_NAME) rbconfig.rb - diff --git a/package/ruby/patches/patch-configure b/package/ruby/patches/patch-configure new file mode 100644 index 000000000..efd25b6ff --- /dev/null +++ b/package/ruby/patches/patch-configure @@ -0,0 +1,11 @@ +--- 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 diff --git a/package/ruby/patches/patch-ext_openssl_ossl_c b/package/ruby/patches/patch-ext_openssl_ossl_c deleted file mode 100644 index 2b649c7dd..000000000 --- a/package/ruby/patches/patch-ext_openssl_ossl_c +++ /dev/null @@ -1,29 +0,0 @@ ---- ruby-1.9.1-p378.orig/ext/openssl/ossl.c 2009-01-15 16:39:30.000000000 +0100 -+++ ruby-1.9.1-p378/ext/openssl/ossl.c 2010-06-12 21:01:58.171613505 +0200 -@@ -92,7 +92,7 @@ ossl_x509_ary2sk(VALUE ary) - - #define OSSL_IMPL_SK2ARY(name, type) \ - VALUE \ --ossl_##name##_sk2ary(STACK *sk) \ -+ossl_##name##_sk2ary(STACK_OF(type) *sk) \ - { \ - type *t; \ - int i, num; \ -@@ -102,7 +102,7 @@ ossl_##name##_sk2ary(STACK *sk) \ - OSSL_Debug("empty sk!"); \ - return Qnil; \ - } \ -- num = sk_num(sk); \ -+ num = sk_##type##_num(sk); \ - if (num < 0) { \ - OSSL_Debug("items in sk < -1???"); \ - return rb_ary_new(); \ -@@ -110,7 +110,7 @@ ossl_##name##_sk2ary(STACK *sk) \ - ary = rb_ary_new2(num); \ - \ - for (i=0; i= 0x10000000L -+#define OSSL_MORE_CONST const -+#define STACK _STACK -+#else -+#define OSSL_MORE_CONST -+#endif -+ -+/* - * Data Conversion - */ - STACK_OF(X509) *ossl_x509_ary2sk0(VALUE); diff --git a/package/ruby/patches/patch-ext_openssl_ossl_pkcs7_c b/package/ruby/patches/patch-ext_openssl_ossl_pkcs7_c deleted file mode 100644 index 1649e0f10..000000000 --- a/package/ruby/patches/patch-ext_openssl_ossl_pkcs7_c +++ /dev/null @@ -1,12 +0,0 @@ ---- ruby-1.9.1-p378.orig/ext/openssl/ossl_pkcs7.c 2008-07-22 17:34:23.000000000 +0200 -+++ ruby-1.9.1-p378/ext/openssl/ossl_pkcs7.c 2010-06-02 21:05:44.261613234 +0200 -@@ -572,7 +572,8 @@ ossl_pkcs7_add_certificate(VALUE self, V - return self; - } - --static STACK * -+ -+static STACK_OF(X509) * - pkcs7_get_certs_or_crls(VALUE self, int want_certs) - { - PKCS7 *pkcs7; -- cgit v1.2.3