Bug 186688 - [patch] devel/libslang2: fix iconv detection
Summary: [patch] devel/libslang2: fix iconv detection
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Renato Botelho
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-02-12 13:10 UTC by Tijl Coosemans
Modified: 2014-02-27 22:30 UTC (History)
0 users

See Also:

Attachments
libslang2.patch (1.04 KB, patch)
2014-02-12 13:10 UTC, Tijl Coosemans 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Tijl Coosemans freebsd_committer freebsd_triage 2014-02-12 13:10:00 UTC 
The configure script has some simple tests that pick up libiconv.so when
it is installed on FreeBSD 10, but the base system iconv should be used
instead.

The attached patch adds --without-iconv to CONFIGURE_ARGS so these tests
are bypassed and the configure script falls back on a more standard iconv
test that does work correctly.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-02-12 13:10:08 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->garga

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Tijl Coosemans freebsd_committer freebsd_triage 2014-02-27 16:35:22 UTC 
Hi Renato,

It's been two weeks, can you please review/approve the patch?
Comment 3 dfilter service freebsd_committer freebsd_triage 2014-02-27 22:21:51 UTC 
Author: tijl
Date: Thu Feb 27 22:21:37 2014
New Revision: 346395
URL: http://svnweb.freebsd.org/changeset/ports/346395
QAT: https://qat.redports.org/buildarchive/r346395/

Log:
  Prefer libc iconv over libiconv.
  
  The configure script has some simple tests that pick up libiconv when it
  is installed.  By passing --without-iconv these tests can be skipped so
  the configure script falls back on a more standard iconv test that tests
  libc before libiconv.  However, this fall-back does not set CFLAGS/LDFLAGS
  correctly when libiconv needs to be used, so only pass --without-iconv
  when libc iconv needs to be used (ICONV_LIB empty).
  
  PR:		ports/186688
  Approved by:	garga (maintainer)

Modified:
  head/devel/libslang2/Makefile

Modified: head/devel/libslang2/Makefile
==============================================================================
--- head/devel/libslang2/Makefile	Thu Feb 27 22:18:36 2014	(r346394)
+++ head/devel/libslang2/Makefile	Thu Feb 27 22:21:37 2014	(r346395)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libslang2
 PORTVERSION=	2.2.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v${PORTVERSION:R}/ \
 		ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${PORTVERSION:R}/ \
@@ -42,11 +42,16 @@ PCRE_CONFIGURE_WITH=	pcre
 PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 PNG_CONFIGURE_WITH=	png
 PNG_LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
-ICONV_CONFIGURE_WITH=	iconv
 ICONV_USES=		iconv
 ONIG_CONFIGURE_WITH=	onig
 ONIG_LIB_DEPENDS=	libonig.so:${PORTSDIR}/devel/oniguruma4
 
+.include <bsd.port.pre.mk>
+
+.if ! ${PORT_OPTIONS:MICONV} || empty(ICONV_LIB)
+CONFIGURE_ARGS+=	--without-iconv
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -E 's,doc/slsh,doc/slang/v\@slang_major_version\@,' \
 		${WRKSRC}/slsh/Makefile.in
@@ -61,4 +66,4 @@ post-install:
 .endfor
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Tijl Coosemans freebsd_committer freebsd_triage 2014-02-27 22:22:09 UTC 
State Changed
From-To: open->closed

Fixed in r346395.