[91728] trunk/dports/devel
ryandesign at macports.org
ryandesign at macports.org
Mon Apr 9 01:02:11 PDT 2012
Revision: 91728
https://trac.macports.org/changeset/91728
Author: ryandesign at macports.org
Date: 2012-04-09 01:02:11 -0700 (Mon, 09 Apr 2012)
Log Message:
-----------
glib2, glib2-devel: alert user build will fail if libelf is installed; advise user to deactivate it; see #33948
Modified Paths:
--------------
trunk/dports/devel/glib2/Portfile
trunk/dports/devel/glib2-devel/Portfile
Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile 2012-04-09 07:22:15 UTC (rev 91727)
+++ trunk/dports/devel/glib2/Portfile 2012-04-09 08:02:11 UTC (rev 91728)
@@ -75,6 +75,15 @@
set libffi_version [exec sed -n {s/Version: //p} ${prefix}/lib/pkgconfig/libffi.pc]
configure.env-append LIBFFI_CFLAGS="-I${prefix}/lib/libffi-${libffi_version}/include" \
LIBFFI_LIBS="-L${prefix}/lib -lffi"
+
+ foreach {badport badfile} "libelf ${prefix}/lib/libelf.a" {
+ if {[file exists ${badfile}]} {
+ ui_error "${name} cannot be built while ${badport} is active."
+ ui_error "Please deactivate ${badport} and try again."
+ ui_error "You can reactivate ${badport} again later."
+ return -code error "${badport} is installed"
+ }
+ }
}
post-patch {
Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile 2012-04-09 07:22:15 UTC (rev 91727)
+++ trunk/dports/devel/glib2-devel/Portfile 2012-04-09 08:02:11 UTC (rev 91728)
@@ -75,6 +75,15 @@
set libffi_version [exec sed -n {s/Version: //p} ${prefix}/lib/pkgconfig/libffi.pc]
configure.env-append LIBFFI_CFLAGS="-I${prefix}/lib/libffi-${libffi_version}/include" \
LIBFFI_LIBS="-L${prefix}/lib -lffi"
+
+ foreach {badport badfile} "libelf ${prefix}/lib/libelf.a" {
+ if {[file exists ${badfile}]} {
+ ui_error "${name} cannot be built while ${badport} is active."
+ ui_error "Please deactivate ${badport} and try again."
+ ui_error "You can reactivate ${badport} again later."
+ return -code error "${badport} is installed"
+ }
+ }
}
post-patch {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120409/33ac1732/attachment-0001.html>
More information about the macports-changes
mailing list