Date: Thu, 20 Jun 2013 11:53:51 +0200 (CEST) From: Tijl Coosemans <tijl@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/179753: [patch] converters/libiconv: remove libtool dependency Message-ID: <201306200953.r5K9rpI6008741@kalimero.tijl.coosemans.org> Resent-Message-ID: <201306201000.r5KA012Z090821@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179753 >Category: ports >Synopsis: [patch] converters/libiconv: remove libtool dependency >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: Thu Jun 20 10:00:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Tijl Coosemans >Release: FreeBSD 10.0-CURRENT i386 >Organization: >Environment: >Description: The attached patch removes USE_AUTOTOOLS from converters/libiconv. It was added in r183830 because the bundled libtool at the time didn't handle the removal of objformat correctly. That is no longer the case. The patch also reverts r239611. It fixed building with clang because the libtool port didn't recognise "clang" as a C compiler. It does now, but so does the bundled libtool. It recognises whatever is passed in CC to configure as a C compiler. Tested with "make CC=/usr/local/bin/clang". >How-To-Repeat: >Fix: --- libiconv.patch begins here --- Index: converters/libiconv/Makefile =================================================================== --- converters/libiconv/Makefile (revision 321354) +++ converters/libiconv/Makefile (working copy) @@ -10,7 +10,6 @@ MASTER_SITES= GNU MAINTAINER= gnome@FreeBSD.org COMMENT= A character set conversion library -USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes LIBTOOLFILES= configure libcharset/configure preload/configure CONFIGURE_ARGS= --enable-static \ Property changes on: converters/libiconv/Makefile ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: converters/libiconv/distinfo =================================================================== --- converters/libiconv/distinfo (revision 321354) +++ converters/libiconv/distinfo (working copy) Property changes on: converters/libiconv/distinfo ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: converters/libiconv/files/patch-lib_Makefile.in =================================================================== --- converters/libiconv/files/patch-lib_Makefile.in (revision 321354) +++ converters/libiconv/files/patch-lib_Makefile.in (working copy) @@ -1,16 +1,5 @@ --- lib/Makefile.in.orig 2011-08-07 19:48:03.000000000 +0200 +++ lib/Makefile.in 2011-10-23 22:03:44.000000000 +0200 -@@ -26,8 +26,8 @@ - -Dset_relocation_prefix=libiconv_set_relocation_prefix \ - -Drelocate=libiconv_relocate @DEFS@ - LIBTOOL = @LIBTOOL@ --LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile --LIBTOOL_LINK = $(LIBTOOL) --mode=link -+LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile --tag=CC -+LIBTOOL_LINK = $(LIBTOOL) --mode=link --tag=CC - LIBTOOL_INSTALL = $(LIBTOOL) --mode=install - LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall - # Windows resource compiler (windres). Used via libtool. @@ -50,7 +50,7 @@ # Before making a release, change this according to the libtool documentation, Property changes on: converters/libiconv/files/patch-lib_Makefile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: converters/libiconv/files/patch-libcharset::lib::Makefile.in =================================================================== --- converters/libiconv/files/patch-libcharset::lib::Makefile.in (revision 321354) +++ converters/libiconv/files/patch-libcharset::lib::Makefile.in (working copy) @@ -1,13 +0,0 @@ ---- libcharset/lib/Makefile.in.orig Thu Jan 30 03:43:59 2003 -+++ libcharset/lib/Makefile.in Tue Oct 14 16:55:29 2003 -@@ -25,8 +25,8 @@ - -Dset_relocation_prefix=libcharset_set_relocation_prefix \ - -Drelocate=libcharset_relocate @DEFS@ - LIBTOOL = @LIBTOOL@ --LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile --LIBTOOL_LINK = $(LIBTOOL) --mode=link -+LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile --tag=CC -+LIBTOOL_LINK = $(LIBTOOL) --mode=link --tag=CC - LIBTOOL_INSTALL = $(LIBTOOL) --mode=install - LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall - RM = rm -f Index: converters/libiconv/files/patch-libcharset::lib::config.charset =================================================================== --- converters/libiconv/files/patch-libcharset::lib::config.charset (revision 321354) +++ converters/libiconv/files/patch-libcharset::lib::config.charset (working copy) Property changes on: converters/libiconv/files/patch-libcharset::lib::config.charset ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: converters/libiconv/files/patch-src::Makefile.in =================================================================== --- converters/libiconv/files/patch-src::Makefile.in (revision 321354) +++ converters/libiconv/files/patch-src::Makefile.in (working copy) @@ -1,16 +1,5 @@ --- src/Makefile.in.orig 2009-06-21 07:17:33.000000000 -0400 +++ src/Makefile.in 2009-07-04 19:46:15.000000000 -0400 -@@ -23,8 +23,8 @@ - LDFLAGS = @LDFLAGS@ - INCLUDES = -I. -I$(srcdir) -I.. -I../include -I$(srcdir)/../include -I../srclib -I$(srcdir)/../srclib - LIBTOOL = @LIBTOOL@ --LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile --LIBTOOL_LINK = $(LIBTOOL) --mode=link -+LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile --tag=CC -+LIBTOOL_LINK = $(LIBTOOL) --mode=link --tag=CC - LIBTOOL_INSTALL = $(LIBTOOL) --mode=install - LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall - WINDRES = @WINDRES@ @@ -113,6 +113,7 @@ install : all force if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi case "@host_os@" in \ Property changes on: converters/libiconv/files/patch-src::Makefile.in ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: converters/libiconv/files/patch-test::Makefile.in =================================================================== --- converters/libiconv/files/patch-test::Makefile.in (revision 321354) +++ converters/libiconv/files/patch-test::Makefile.in (working copy) @@ -1,13 +0,0 @@ ---- tests/Makefile.in.orig 2009-08-11 23:52:40.000000000 +0000 -+++ tests/Makefile.in 2009-08-11 23:56:06.000000000 +0000 -@@ -12,8 +12,8 @@ - LDFLAGS = @LDFLAGS@ - INCLUDES = -I. -I$(srcdir) -I../include -I$(srcdir)/../include -I../srclib -I$(srcdir)/../srclib -I../lib - LIBTOOL = @LIBTOOL@ --LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile --LIBTOOL_LINK = $(LIBTOOL) --mode=link -+LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile --tag=CC -+LIBTOOL_LINK = $(LIBTOOL) --mode=link --tag=CC - LIBTOOL_INSTALL = $(LIBTOOL) --mode=install - LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall - RM = rm -f Index: converters/libiconv/pkg-descr =================================================================== --- converters/libiconv/pkg-descr (revision 321354) +++ converters/libiconv/pkg-descr (working copy) Property changes on: converters/libiconv/pkg-descr ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: converters/libiconv/pkg-plist =================================================================== --- converters/libiconv/pkg-plist (revision 321354) +++ converters/libiconv/pkg-plist (working copy) Property changes on: converters/libiconv/pkg-plist ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property --- libiconv.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?201306200953.r5K9rpI6008741>