Date: Wed, 12 Feb 2014 22:48:41 +0100 (CET) From: Tijl Coosemans <tijl@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/186707: [patch] devel/qt4-corelib: fix iconv detection Message-ID: <201402122148.s1CLmf8v049678@kalimero.tijl.coosemans.org> Resent-Message-ID: <201402122150.s1CLo0BA076128@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 186707
>Category: ports
>Synopsis: [patch] devel/qt4-corelib: fix iconv detection
>Confidential: no
>Severity: non-critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 12 21:50:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Tijl Coosemans
>Release: FreeBSD 11.0-CURRENT i386
>Organization:
>Environment:
>Description:
On FreeBSD 10 with converters/libiconv installed qt4-corelib uses libiconv
instead of libc iconv. This is because the configure test doesn't respect
CXXFLAGS (which contains -DLIBICONV_PLUG).
The attached patch makes all compile tests respect CXXFLAGS.
>How-To-Repeat:
>Fix:
--- qt4-corelib.patch begins here ---
Index: devel/qt4-corelib/Makefile
===================================================================
--- devel/qt4-corelib/Makefile (revision 343867)
+++ devel/qt4-corelib/Makefile (working copy)
@@ -3,7 +3,7 @@
PORTNAME= corelib
DISTVERSION= ${QT4_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
PKGNAMEPREFIX= qt4-
Index: devel/qt4-corelib/files/patch-config.tests-unix-compile.test
===================================================================
--- devel/qt4-corelib/files/patch-config.tests-unix-compile.test (revision 0)
+++ devel/qt4-corelib/files/patch-config.tests-unix-compile.test (working copy)
@@ -0,0 +1,11 @@
+--- config.tests/unix/compile.test.orig
++++ config.tests/unix/compile.test
+@@ -13,7 +13,7 @@
+ shift 7
+ LFLAGS="$SYSROOT_FLAG"
+ INCLUDEPATH=""
+-CXXFLAGS="$SYSROOT_FLAG"
++CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG"
+ MAC_ARCH_CXXFLAGS=""
+ MAC_ARCH_LFLAGS=""
+ while [ "$#" -gt 0 ]; do
Property changes on: devel/qt4-corelib/files/patch-config.tests-unix-compile.test
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
--- qt4-corelib.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?201402122148.s1CLmf8v049678>