From 6bcb1da8d586f16adbb15dc92d5c32ad6388e748 Mon Sep 17 00:00:00 2001 From: swills Date: Wed, 7 Dec 2016 12:47:30 +0000 Subject: lang/ruby22: fix setjmp clobbered variables PR: 206110 Submitted by: dim --- Mk/bsd.ruby.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Mk') diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index ca65d7c1d34..f35b63b87ea 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -165,7 +165,7 @@ RUBY21= "" # PLIST_SUB helpers # Ruby 2.2 # RUBY_RELVERSION= 2.2.6 -RUBY_PORTREVISION= 0 +RUBY_PORTREVISION= 1 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY22= "" # PLIST_SUB helpers -- cgit From 3f0830870e7db1890c6b6c8f18d055b6d5a779d0 Mon Sep 17 00:00:00 2001 From: swills Date: Wed, 7 Dec 2016 16:08:54 +0000 Subject: lang/ruby23: fix setjmp clobbered variables PR: 206111 Submitted by: dim --- Mk/bsd.ruby.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Mk') diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index f35b63b87ea..11e501b7f81 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -175,7 +175,7 @@ RUBY22= "" # PLIST_SUB helpers # Ruby 2.3 # RUBY_RELVERSION= 2.3.3 -RUBY_PORTREVISION= 0 +RUBY_PORTREVISION= 1 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY23= "" # PLIST_SUB helpers -- cgit From 93bdbd7bc17abb608ddb0e739fb62d0cfd81b3a3 Mon Sep 17 00:00:00 2001 From: swills Date: Thu, 8 Dec 2016 02:57:06 +0000 Subject: lang/ruby21: fix setjmp clobbered variables PR: 206108 Submitted by: dim --- Mk/bsd.ruby.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Mk') diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 11e501b7f81..06c6b8e1ff8 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -155,7 +155,7 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME} # Ruby 2.1 # RUBY_RELVERSION= 2.1.10 -RUBY_PORTREVISION= 0 +RUBY_PORTREVISION= 1 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 RUBY21= "" # PLIST_SUB helpers -- cgit From ef593dbde336354c7f31e1c4b4a4c77c6f389784 Mon Sep 17 00:00:00 2001 From: tijl Date: Thu, 8 Dec 2016 13:46:15 +0000 Subject: Simplify USES=linux do-install and add support for architecture specific distfiles. --- Mk/Uses/linux.mk | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'Mk') diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk index 6e9865568b4..e4dfe597847 100644 --- a/Mk/Uses/linux.mk +++ b/Mk/Uses/linux.mk @@ -303,12 +303,28 @@ PLIST?= ${PKGDIR}/pkg-plist.${LINUX_ARCH} .if !target(do-install) do-install: - (cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \;) - (cd ${WRKSRC} && ${FIND} * ! -type d | ${CPIO} -pm ${STAGEDIR}${PREFIX}) + (cd ${WRKSRC} && ${FIND} * | ${CPIO} -dumpl ${STAGEDIR}${PREFIX}) .endif .endif # USE_LINUX_RPM +.ifdef DISTNAME_i386 +DISTFILES_i386?= ${DISTNAME_i386}${EXTRACT_SUFX} +.endif +.ifdef DISTNAME_x86_64 +DISTFILES_x86_64?= ${DISTNAME_x86_64}${EXTRACT_SUFX} +.endif +.ifdef DISTFILES_i386 || DISTFILES_x86_64 +.if make(makesum) +.if !defined(DISTFILES) +DISTFILES= ${DISTFILES_i386} ${DISTFILES_x86_64} +EXTRACT_ONLY?= ${DISTFILES_${LINUX_ARCH}} +.endif +.else +DISTFILES?= ${DISTFILES_${LINUX_ARCH}} +.endif +.endif + # With fmake :M${var} only works when ${var} is a for loop variable. .for fmakehack in ${LINUX_ARCH:S/x86_64/amd64/} .if (defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:M${fmakehack})) \ -- cgit From 70732e32705e86dc513948f8597d70e91242be9a Mon Sep 17 00:00:00 2001 From: mat Date: Fri, 9 Dec 2016 14:24:07 +0000 Subject: Report the binary with bad linking. Sponsored by: Absolight --- Mk/Scripts/qa.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Mk') diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh index fcbea5b8962..878279c522e 100644 --- a/Mk/Scripts/qa.sh +++ b/Mk/Scripts/qa.sh @@ -107,15 +107,19 @@ shebang() { baselibs() { local rc local found_openssl + local file [ "${PKGBASE}" = "pkg" -o "${PKGBASE}" = "pkg-devel" ] && return while read f; do case ${f} in + File:\ .*) + file=${f#File: .} + ;; *NEEDED*\[libarchive.so.[56]]) - err "Bad linking on ${f##* } please add USES=libarchive" + err "Bad linking on ${f##* } for ${file} please add USES=libarchive" rc=1 ;; *NEEDED*\[libedit.so.7]) - err "Bad linking on ${f##* } please add USES=libedit" + err "Bad linking on ${f##* } for ${file} please add USES=libedit" rc=1 ;; *NEEDED*\[libcrypto.so.*]|*NEEDED*\[libssl.so.*]) -- cgit From 027ac7b4eecad3546e6124fedb8605268712e4a2 Mon Sep 17 00:00:00 2001 From: rene Date: Fri, 9 Dec 2016 18:47:09 +0000 Subject: Uses/kmod.mk: add support for debug versions of kernel modules. Submitted by: glebius via private mail --- Mk/Uses/kmod.mk | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Mk') diff --git a/Mk/Uses/kmod.mk b/Mk/Uses/kmod.mk index f9aa4be155f..28c18e63805 100644 --- a/Mk/Uses/kmod.mk +++ b/Mk/Uses/kmod.mk @@ -34,13 +34,19 @@ MAKE_ENV+= KMODDIR="${KMODDIR}" SYSDIR="${SRC_BASE}/sys" NO_XREF=yes PLIST_FILES+= "@kld ${KMODDIR}" STRIP_CMD+= --strip-debug # do not strip kernel symbols +KERN_DEBUGDIR?= ${DEBUGDIR} .endif .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_KMOD_POST_MK) _INCLUDE_USES_KMOD_POST_MK= yes _USES_install+= 290:${STAGEDIR}${KMODDIR} +_USES_install+= 291:${STAGEDIR}${KERN_DEBUGDIR}${KMODDIR} + ${STAGEDIR}${KMODDIR}: @${MKDIR} ${.TARGET} +${STAGEDIR}${KERN_DEBUGDIR}${KMODDIR}: + @${MKDIR} ${.TARGET} + .endif -- cgit