diff options
| author | Koop Mast <kwm@rainbow-runner.nl> | 2016-12-10 23:29:02 +0800 |
|---|---|---|
| committer | Koop Mast <kwm@rainbow-runner.nl> | 2016-12-10 23:29:02 +0800 |
| commit | b1001d70f01d51c768db3a1e8e00cd1b7a245440 (patch) | |
| tree | 7268e086efcba602ca5f14534bce6f7075c92810 /Mk | |
| parent | 2c467c5afbd45537746e9d808e5e92481c8d28b9 (diff) | |
| parent | 43ae45671e24ac2b498ed0e5af2e3d27383b4320 (diff) | |
| download | freebsd-ports-graphics-mesa-next.tar.gz freebsd-ports-graphics-mesa-next.tar.zst freebsd-ports-graphics-mesa-next.zip | |
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Scripts/qa.sh | 8 | ||||
| -rw-r--r-- | Mk/Uses/kmod.mk | 6 | ||||
| -rw-r--r-- | Mk/Uses/linux.mk | 20 | ||||
| -rw-r--r-- | Mk/bsd.ruby.mk | 6 |
4 files changed, 33 insertions, 7 deletions
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.*]) 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 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})) \ diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index ca65d7c1d34..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 @@ -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 @@ -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 |