diff options
| author | spz <spz> | 2011-02-12 11:33:40 +0000 |
|---|---|---|
| committer | spz <spz> | 2011-02-12 11:33:40 +0000 |
| commit | 88a4ff265d5bbc8fe6f5114b9d9e0bd5698367f0 (patch) | |
| tree | 5b8d29a3698df7a0f6286ccc93db443e7a826036 | |
| parent | 6ee8c1c38ae733a6002d1413644033ca99bd5b6d (diff) | |
| download | pkgsrc-88a4ff265d5bbc8fe6f5114b9d9e0bd5698367f0.tar.gz | |
Pullup ticket 3345 - requested by taca
portability fix
Revisions pulled up:
- pkgsrc/lang/ruby19-base/Makefile 1.6
- pkgsrc/lang/ruby19-base/distinfo 1.3
- pkgsrc/lang/ruby19-base/patches/patch-as 1.2
-------------------------------------------------------------------------
Module Name: pkgsrc
Committed By: taca
Date: Mon Feb 7 11:15:29 UTC 2011
Modified Files:
pkgsrc/lang/ruby19-base: Makefile distinfo
pkgsrc/lang/ruby19-base/patches: patch-as
Log Message:
Add a patch from FreeBSD's port and it fixes runtime problem
on DragonFly, too. The patch was provided by Rumko via private mail.
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/ruby19-base/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ruby19-base/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/lang/ruby19-base/patches/patch-as
| -rw-r--r-- | lang/ruby19-base/Makefile | 3 | ||||
| -rw-r--r-- | lang/ruby19-base/distinfo | 4 | ||||
| -rw-r--r-- | lang/ruby19-base/patches/patch-as | 15 |
3 files changed, 17 insertions, 5 deletions
diff --git a/lang/ruby19-base/Makefile b/lang/ruby19-base/Makefile index 67348219832..dbe645e7ee5 100644 --- a/lang/ruby19-base/Makefile +++ b/lang/ruby19-base/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2010/12/26 12:33:16 taca Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2011/02/12 11:33:40 spz Exp $ # DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX} +PKGREVISION= 1 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} #PKGREVISION= diff --git a/lang/ruby19-base/distinfo b/lang/ruby19-base/distinfo index 025a4257efe..50694f0efe1 100644 --- a/lang/ruby19-base/distinfo +++ b/lang/ruby19-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2010/12/26 12:33:16 taca Exp $ +$NetBSD: distinfo,v 1.2.2.1 2011/02/12 11:33:40 spz Exp $ SHA1 (ruby-1.9.2-p136.tar.bz2) = 3f9023d00be44104d2fef485843f123bb6de6c37 RMD160 (ruby-1.9.2-p136.tar.bz2) = 91fec5fc667035b5d281a55c268b79c71b4c1277 @@ -21,6 +21,6 @@ SHA1 (patch-ao) = 32ba4bd0eccd849f7294bc60a66d181966e472b9 SHA1 (patch-ap) = 1fdb7563c1ee43466f47a2a98bbdc6a242a84f0f SHA1 (patch-aq) = 740e5231beaa1e42f464f2ec7b52c3ed69bb5f39 SHA1 (patch-ar) = 8a4b8ae18f9bdafc1bfbbd9ec62d18caf890571e -SHA1 (patch-as) = 468683d6ac7a7330a2b2bcb19bc55cbf800781c6 +SHA1 (patch-as) = 2005d2b5ca10d79188e8615383b881d5c9dfb616 SHA1 (patch-at) = 532eebfda565d78b9d7ab572b7d8539933e431a3 SHA1 (patch-au) = 45073c6d3461ee181e89228beb088d161af3d735 diff --git a/lang/ruby19-base/patches/patch-as b/lang/ruby19-base/patches/patch-as index 5e023ec0f18..e725bb0b753 100644 --- a/lang/ruby19-base/patches/patch-as +++ b/lang/ruby19-base/patches/patch-as @@ -1,6 +1,8 @@ -$NetBSD: patch-as,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $ +$NetBSD: patch-as,v 1.1.1.1.4.1 2011/02/12 11:33:40 spz Exp $ -Handle 64bit size of time_t. +* Handle 64bit size of time_t. +* On FreeBSD and DragonFly PTHREAD_STACK_MIN is too small. Taken from + FreeBSD ports --- thread_pthread.c.orig 2010-07-22 13:13:57.000000000 +0000 +++ thread_pthread.c @@ -37,3 +39,12 @@ Handle 64bit size of time_t. r = pthread_cond_timedwait(&th->native_thread_data.sleep_cond, &th->interrupt_lock, &ts); if (r && r != ETIMEDOUT) rb_bug_errno("pthread_cond_timedwait", r); +@@ -822,7 +828,7 @@ + int err; + + pthread_attr_init(&attr); +-#ifdef PTHREAD_STACK_MIN ++#if defined(PTHREAD_STACK_MIN) && !defined(__FreeBSD__) && !defined(__DragonFly__) + pthread_attr_setstacksize(&attr, + PTHREAD_STACK_MIN + (THREAD_DEBUG ? BUFSIZ : 0)); + #endif |