Browse Source

update to latest upstream, fix package install by using standard install target

Waldemar Brodkorb 10 years ago
parent
commit
ee0285f245

+ 3 - 7
package/libiconv/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libiconv
-PKG_VERSION:=		1.13.1
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		7ab33ebd26687c744a37264a330bbe9a
+PKG_VERSION:=		1.14
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		e34509b1623cec449dfeb73d7ce9c6c6
 PKG_DESCR:=		character set conversion library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.gnu.org/software/libiconv/
@@ -21,10 +21,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBICONV,libiconv,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
-TARGET_CFLAGS+=		-fPIC
-INSTALL_TARGET=		install-lib
-
 libiconv-install:
 	${INSTALL_DIR} ${IDIR_LIBICONV}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libiconv.so* ${IDIR_LIBICONV}/usr/lib/

+ 0 - 11
package/libiconv/patches/patch-build-aux_ltmain_sh

@@ -1,11 +0,0 @@
---- libiconv-1.13.1.orig/build-aux/ltmain.sh	2009-06-21 13:17:33.000000000 +0200
-+++ libiconv-1.13.1/build-aux/ltmain.sh	2011-01-14 00:42:49.000000000 +0100
-@@ -4885,7 +4885,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"

+ 0 - 11
package/libiconv/patches/patch-libcharset_build-aux_ltmain_sh

@@ -1,11 +0,0 @@
---- libiconv-1.13.1.orig/libcharset/build-aux/ltmain.sh	2009-06-21 13:17:33.000000000 +0200
-+++ libiconv-1.13.1/libcharset/build-aux/ltmain.sh	2011-01-14 00:44:22.000000000 +0100
-@@ -4885,7 +4885,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"

+ 0 - 16
package/libiconv/patches/patch-preload_Makefile_in

@@ -1,16 +0,0 @@
---- libiconv-1.13.orig/preload/Makefile.in	2009-01-17 00:11:37.000000000 +0100
-+++ libiconv-1.13/preload/Makefile.in	2009-10-10 22:01:15.666144195 +0200
-@@ -54,11 +54,11 @@ preloadable_libiconv.so : $(SOURCES)
- 	done && \
- 	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o libiconv.la -rpath $(libdir) -no-undefined objects/*.lo && \
- 	$(RM) -r objects
--	cp .libs/libiconv.so preloadable_libiconv.so
-+	-test -f .libs/libiconv.so && cp .libs/libiconv.so preloadable_libiconv.so
- 
- install : all force
- 	if [ ! -d $(DESTDIR)$(libdir) ] ; then $(mkinstalldirs) $(DESTDIR)$(libdir) ; fi
--	if test -n "@PLUGLIB@"; then $(INSTALL_DATA) @PLUGLIB@ $(DESTDIR)$(libdir)/@PLUGLIB@.new && mv $(DESTDIR)$(libdir)/@PLUGLIB@.new $(DESTDIR)$(libdir)/@PLUGLIB@ ; fi
-+	-if test -n "@PLUGLIB@"; then $(INSTALL_DATA) @PLUGLIB@ $(DESTDIR)$(libdir)/@PLUGLIB@.new && mv $(DESTDIR)$(libdir)/@PLUGLIB@.new $(DESTDIR)$(libdir)/@PLUGLIB@ ; fi
- 
- install-strip : install
- 

+ 0 - 11
package/libiconv/patches/patch-src_Makefile_in

@@ -1,11 +0,0 @@
---- libiconv-1.13.1.orig/src/Makefile.in	2009-06-21 13:17:33.000000000 +0200
-+++ libiconv-1.13.1/src/Makefile.in	2011-02-04 17:12:50.000000000 +0100
-@@ -113,7 +113,7 @@ install : all force
- 	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
- 	case "@host_os@" in \
- 	  hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
--	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
-+	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
- 	esac
- 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
-