Tue Aug 31 11:37:18 2021 UTC ()
ruby: make sure there isn't already a ruby in buildlink before linking


(markd)
diff -r1.19 -r1.20 pkgsrc/lang/ruby/buildlink3.mk
cvs diff -r1.19 -r1.20 pkgsrc/lang/ruby/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/buildlink3.mk 2018/01/07 13:04:20 1.19
+++ pkgsrc/lang/ruby/buildlink3.mk 2021/08/31 11:37:18 1.20
@@ -1,36 +1,37 @@ @@ -1,36 +1,37 @@
1# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:20 rillig Exp $ 1# $NetBSD: buildlink3.mk,v 1.20 2021/08/31 11:37:18 markd Exp $
2 2
3BUILDLINK_TREE+= ${RUBY_BASE} 3BUILDLINK_TREE+= ${RUBY_BASE}
4 4
5.if !defined(RUBY_BUILDLINK3_MK) 5.if !defined(RUBY_BUILDLINK3_MK)
6RUBY_BUILDLINK3_MK:= 6RUBY_BUILDLINK3_MK:=
7 7
8.if !defined(_RUBYVERSION_MK) 8.if !defined(_RUBYVERSION_MK)
9.include "../../lang/ruby/rubyversion.mk" 9.include "../../lang/ruby/rubyversion.mk"
10.endif 10.endif
11 11
12BUILDLINK_API_DEPENDS.${RUBY_BASE}+= ${RUBY_BASE}>=${RUBY_VERSION} 12BUILDLINK_API_DEPENDS.${RUBY_BASE}+= ${RUBY_BASE}>=${RUBY_VERSION}
13BUILDLINK_ABI_DEPENDS.${RUBY_BASE}+= ${RUBY_BASE}>=${RUBY_ABI_VERSION} 13BUILDLINK_ABI_DEPENDS.${RUBY_BASE}+= ${RUBY_BASE}>=${RUBY_ABI_VERSION}
14BUILDLINK_PKGSRCDIR.${RUBY_BASE}?= ${RUBY_SRCDIR} 14BUILDLINK_PKGSRCDIR.${RUBY_BASE}?= ${RUBY_SRCDIR}
15BUILDLINK_FILES.${RUBY_BASE}+= lib/libruby${RUBY_SUFFIX}.* 15BUILDLINK_FILES.${RUBY_BASE}+= lib/libruby${RUBY_SUFFIX}.*
16BUILDLINK_FILES.${RUBY_BASE}+= lib/ruby/${RUBY_VER_DIR}/${RUBY_ARCH}/*.h 16BUILDLINK_FILES.${RUBY_BASE}+= lib/ruby/${RUBY_VER_DIR}/${RUBY_ARCH}/*.h
17 17
18BUILDLINK_TARGETS+= buildlink-bin-ruby 18BUILDLINK_TARGETS+= buildlink-bin-ruby
19 19
20buildlink-bin-ruby: 20buildlink-bin-ruby:
21 ${RUN} \ 21 ${RUN} \
22 f=${BUILDLINK_PREFIX.${RUBY_BASE}}"/bin/ruby${RUBY_SUFFIX}"; \ 22 f=${BUILDLINK_PREFIX.${RUBY_BASE}}"/bin/ruby${RUBY_SUFFIX}"; \
23 if ${TEST} -f $$f; then \ 23 if ${TEST} -f $$f; then \
 24 ${RM} -f ${BUILDLINK_DIR}/bin/ruby; \
24 ${LN} -s $$f ${BUILDLINK_DIR}/bin/ruby; \ 25 ${LN} -s $$f ${BUILDLINK_DIR}/bin/ruby; \
25 fi 26 fi
26 27
27.if empty(RUBY_USE_PTHREAD:M[nN][oO]) 28.if empty(RUBY_USE_PTHREAD:M[nN][oO])
28PTHREAD_OPTS+= native 29PTHREAD_OPTS+= native
29PTHREAD_AUTO_VARS= yes 30PTHREAD_AUTO_VARS= yes
30 31
31.include "../../mk/pthread.buildlink3.mk" 32.include "../../mk/pthread.buildlink3.mk"
32.endif 33.endif
33.include "../../mk/dlopen.buildlink3.mk" 34.include "../../mk/dlopen.buildlink3.mk"
34 35
35.endif # RUBY_BUILDLINK3_MK 36.endif # RUBY_BUILDLINK3_MK
36 37