Attachment #169782 for bug #209123

View | Details | Raw Unified | Return to bug 209123
Collapse All | Expand All




					;;
				*0)
					has_some_libperl_so=1
					# Older Perl did not USE_LDCONFIG.
					if [ ! -f ${LOCALBASE}/${LDCONFIG_DIR}/perl5 ]; then
						case "${found}" in
							*1?)
								warn "${f} does not have a rpath to ${LIBPERL}, not respecting lddlflags?"
								;;
						esac
						case "${found}" in
							1??)
								warn "${f} does not have a runpath to ${LIBPERL}, not respecting lddlflags?"
								;;
						esac
					fi
					;;
			esac
		# Use heredoc to avoid losing rc from find|while subshell

Lines 1520-1525 QA_ENV+= STAGEDIR=${STAGEDIR} \ Link Here

(-)Mk/bsd.port.mk (+1 lines)
1520	LOCALBASE=${LOCALBASE} \	1520	LOCALBASE=${LOCALBASE} \
1521	"STRIP=${STRIP}" \	1521	"STRIP=${STRIP}" \
1522	TMPPLIST=${TMPPLIST} \	1522	TMPPLIST=${TMPPLIST} \
		1523	LDCONFIG_DIR="${LDCONFIG_DIR}" \
1523	PKGBASE=${PKGBASE}	1524	PKGBASE=${PKGBASE}
1524	.if !empty(USES:Mdesktop-file-utils)	1525	.if !empty(USES:Mdesktop-file-utils)
1525	QA_ENV+= USESDESKTOPFILEUTILS=yes	1526	QA_ENV+= USESDESKTOPFILEUTILS=yes

Lines 107-114 CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ Link Here

(-)lang/perl5-devel/Makefile (-2 / +5 lines)
107	# shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.	107	# shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.
108	# XXX change the soname to $$(LIBPERL:R)	108	# XXX change the soname to $$(LIBPERL:R)
109	CONFIGURE_ARGS+= \	109	CONFIGURE_ARGS+= \
110	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE -lperl' \	110	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
111	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL)'	111	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL)'
		112
		113	# Give a hint of where libperl.so can be found.
		114	USE_LDCONFIG= ${PREFIX}/${_ARCH_LIB}/CORE
112		115
113	# XXX Remove	116	# XXX Remove
114	CONFIGURE_ARGS+= -Dusedevel -Uversiononly	117	CONFIGURE_ARGS+= -Dusedevel -Uversiononly

Lines 98-105 CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ Link Here

(-)lang/perl5.18/Makefile (-2 / +6 lines)
98	# lddlflags is used for all .so linking	98	# lddlflags is used for all .so linking
99	# shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.	99	# shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.
100	CONFIGURE_ARGS+= \	100	CONFIGURE_ARGS+= \
101	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE -lperl' \	101	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
102	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)'	102	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)'
		103
		104	# Give a hint of where libperl.so can be found.
		105	USE_LDCONFIG= ${PREFIX}/${_ARCH_LIB}/CORE
		106
103	LOCALE_CLEANUP= LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \	107	LOCALE_CLEANUP= LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \
104	LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \	108	LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \
105	LC_TIME=""	109	LC_TIME=""

Lines 92-99 CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ Link Here

(-)lang/perl5.20/Makefile (-2 / +5 lines)
92	# lddlflags is used for all .so linking	92	# lddlflags is used for all .so linking
93	# shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.	93	# shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.
94	CONFIGURE_ARGS+= \	94	CONFIGURE_ARGS+= \
95	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE -lperl' \	95	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
96	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)'	96	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)'
		97
		98	# Give a hint of where libperl.so can be found.
		99	USE_LDCONFIG= ${PREFIX}/${_ARCH_LIB}/CORE
97		100
98	LOCALE_CLEANUP= LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \	101	LOCALE_CLEANUP= LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \
99	LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \	102	LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \

Lines 91-98 CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \ Link Here

(-)lang/perl5.22/Makefile (-2 / +5 lines)
91	# lddlflags is used for all .so linking	91	# lddlflags is used for all .so linking
92	# shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.	92	# shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.
93	CONFIGURE_ARGS+= \	93	CONFIGURE_ARGS+= \
94	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE -lperl' \	94	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
95	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)'	95	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)'
		96
		97	# Give a hint of where libperl.so can be found.
		98	USE_LDCONFIG= ${PREFIX}/${_ARCH_LIB}/CORE
96		99
97	LOCALE_CLEANUP= LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \	100	LOCALE_CLEANUP= LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \
98	LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \	101	LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \

Return to bug 209123

Lines 255-270 libperl() { Link Here

(-)Mk/Scripts/qa.sh (-10 / +13 lines)
255	;;	255	;;
256	*0)	256	*0)
257	has_some_libperl_so=1	257	has_some_libperl_so=1
258	case "${found}" in	258	# Older Perl did not USE_LDCONFIG.
259	*1?)	259	if [ ! -f ${LOCALBASE}/${LDCONFIG_DIR}/perl5 ]; then
260	warn "${f} does not have a rpath to ${LIBPERL}, not respecting lddlflags?"	260	case "${found}" in
261	;;	261	*1?)
262	esac	262	warn "${f} does not have a rpath to ${LIBPERL}, not respecting lddlflags?"
263	case "${found}" in	263	;;
264	1??)	264	esac
265	warn "${f} does not have a runpath to ${LIBPERL}, not respecting lddlflags?"	265	case "${found}" in
266	;;	266	1??)
267	esac	267	warn "${f} does not have a runpath to ${LIBPERL}, not respecting lddlflags?"
		268	;;
		269	esac
		270	fi
268	;;	271	;;
269	esac	272	esac
270	# Use heredoc to avoid losing rc from find\|while subshell	273	# Use heredoc to avoid losing rc from find\|while subshell