diff options
| author | pav <pav@FreeBSD.org> | 2006-05-24 08:06:06 +0000 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2006-05-24 08:06:06 +0000 |
| commit | 9352ff0c49aa4ff2f225555cee48c789be08db88 (patch) | |
| tree | 2d9ac15d54e7f9eb5798f3e892072ef6e53ec7a3 /lang | |
| parent | d02080df02cd7424c8758ea19806f0dd3405f7d9 (diff) | |
| download | FreeBSD-ports-9352ff0c49aa4ff2f225555cee48c789be08db88.zip FreeBSD-ports-9352ff0c49aa4ff2f225555cee48c789be08db88.tar.gz | |
- Don't link pthread libs in non-pthread case (the default case)
PR: ports/97765 (based on)
Submitted by: Takeshi MUTOH <mutoh@openedu.org>
Diffstat (limited to 'lang')
| -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 39c834e..2d90727 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= "" |
