Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 2 May 2014 18:19:54 +0200 (CEST)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/189255: [patch] Mk/Scripts/qa.sh: look for libtool libraries
Message-ID:  <201405021619.s42GJsMw032770@kalimero.tijl.coosemans.org>
Resent-Message-ID: <201405021630.s42GU0vH070580@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         189255
>Category:       ports
>Synopsis:       [patch] Mk/Scripts/qa.sh: look for libtool libraries
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 02 16:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Tijl Coosemans
>Release:        FreeBSD 11.0-CURRENT i386
>Organization:
>Environment:
>Description:
- Print an error message in stage-qa when libtool libraries are found
  and USES=libtool is missing.
- Fix the condition for USESSHAREDMIMEINFO in Mk/bsd.stage.mk.
>How-To-Repeat:
>Fix:
--- stage-qa.patch begins here ---
Index: Mk/bsd.stage.mk
===================================================================
--- Mk/bsd.stage.mk	(revision 352745)
+++ Mk/bsd.stage.mk	(working copy)
@@ -17,7 +17,10 @@ QA_ENV+=	STAGEDIR=${STAGEDIR} \
 .if !empty(USES:Mdesktop-file-utils)
 QA_ENV+=	USESDESKTOPFILEUTILS=yes
 .endif
-.if !empty(USES:Mdesktop-file-utils)
+.if !empty(USES:Mlibtool*)
+QA_ENV+=	USESLIBTOOL=yes
+.endif
+.if !empty(USES:Mshared-mime-info)
 QA_ENV+=	USESSHAREDMIMEINFO=yes
 .endif
 CO_ENV+=	STAGEDIR=${STAGEDIR} \
Index: Mk/Scripts/qa.sh
===================================================================
--- Mk/Scripts/qa.sh	(revision 352745)
+++ Mk/Scripts/qa.sh	(working copy)
@@ -172,7 +172,17 @@ suidfiles() {
 	return 0
 }
 
-checks="shebang symlinks paths stripped desktopfileutils sharedmimeinfo suidfiles"
+ltlibraries() {
+	if [ -z "${USESLIBTOOL}" ]; then
+		find ${STAGEDIR} -type f -name '*.la' | while read f; do
+			grep -q 'libtool library' "${f}" &&
+				err "you need USES=libtool" && return 1
+		done
+	fi
+	return 0
+}
+
+checks="shebang symlinks paths stripped desktopfileutils sharedmimeinfo suidfiles ltlibraries"
 
 ret=0
 cd ${STAGEDIR}
--- stage-qa.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405021619.s42GJsMw032770>