diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2006-05-24 08:06:06 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2006-05-24 08:06:06 +0000 |
| commit | 692d35c93029f8b416d61ce45b899810ff28f11d (patch) | |
| tree | f67cf35e842e2b01778896074b4a2e914b26d5a9 /lang/ruby18 | |
| parent | 61b42467fe2c40275edf724c468b34bcdf86bb77 (diff) | |
| download | ports-692d35c93029f8b416d61ce45b899810ff28f11d.tar.gz ports-692d35c93029f8b416d61ce45b899810ff28f11d.zip | |
- Don't link pthread libs in non-pthread case (the default case)
PR: ports/97765 (based on)
Submitted by: Takeshi MUTOH <mutoh@openedu.org>
Notes
Notes:
svn path=/head/; revision=163245
Diffstat (limited to 'lang/ruby18')
| -rw-r--r-- | lang/ruby18/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile index 39c834eff251..2d9072768daf 100644 --- a/lang/ruby18/Makefile +++ b/lang/ruby18/Makefile @@ -7,7 +7,7 @@ PORTNAME= ruby PORTVERSION= ${RUBY_PORTVERSION} -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= lang ruby ipv6 MASTER_SITES= ${MASTER_SITE_RUBY} @@ -43,6 +43,8 @@ CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ .if defined(WITH_PTHREADS) CONFIGURE_ARGS+=--enable-pthread PKGNAMESUFFIX:= ${PKGNAMESUFFIX}+pthreads +CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ + LIBS="${LIBS} ${PTHREAD_LIBS}" .else CONFIGURE_ARGS+=--disable-pthread .endif @@ -70,9 +72,6 @@ EXTRA_PATCHES= ${PATCHDIR}/extrapatch-eval.c CONFIGURE_ARGS+= --enable-ipv6 .endif -CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ - LIBS="${LIBS} ${PTHREAD_LIBS}" - .if ${RUBY_VER} == ${RUBY_DEFAULT_VER} MLINKS= ${RUBY_NAME}.1 ruby.1 IF_DEFAULT= "" |