diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2003-11-24 12:43:40 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2003-11-24 12:43:40 +0000 |
| commit | 9b0614fee942c9337400002d58f9f5b9c2df7ef7 (patch) | |
| tree | 7998007c142a22d7572e44904760de5508072de0 /Mk/bsd.ruby.mk | |
| parent | Fix build on sparc64 (diff) | |
Set the configure target properly and unbreak packaging for amd64.
It turned out that the configure target does not need to be
overridable but just RUBY_ARCH does for those who are to use a
hand-built interpreter with modules from ports.
Hint given from: obrien
Approved by: kris (implicitly), and myself
Notes
Notes:
svn path=/head/; revision=94760
Diffstat (limited to 'Mk/bsd.ruby.mk')
| -rw-r--r-- | Mk/bsd.ruby.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index b31e84b3e430..8cdaf119fc18 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -148,6 +148,8 @@ RUBY_PORTVERSION?= ${RUBY_VERSION}.2003.10.15 .endif # defined(RUBY_VER) && ${RUBY_VER} == 1.8 +CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL:C/\..*//}${RUBY_R} + RUBY_ARCH?= ${ARCH}-freebsd${OSREL:C/\..*//}${RUBY_R} RUBY_NAME?= ruby${RUBY_SUFFIX} @@ -181,9 +183,7 @@ RUBY_WITH_SUFFIX?= ${RUBY_WITHOUT_SUFFIX}${_RUBY_SUFFIX} RUBY_PKGNAMEPREFIX?= ruby${RUBY_SUFFIX}- # could be rb${RUBY_SUFFIX}- RUBY_SHLIBVER?= ${RUBY_VER:S/.//} -CONFIGURE_TARGET= # empty - -RUBY_CONFIGURE_ARGS+= --target="${RUBY_ARCH}" --program-prefix="" +RUBY_CONFIGURE_ARGS+= --program-prefix="" # PORTDIRNAME is not defined yet _IS_RUBY_R_PORT= ${.CURDIR:M*_r} |