diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-10-11 19:36:32 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-10-11 19:36:32 +0200 |
| commit | 6d26b19269a28ff576e872473cb3b4610a61fceb (patch) | |
| tree | d93378254682782dbe0175dcf69edb1fbf65dbe3 /package/libiconv | |
| parent | b45a02c444117a90d202706013d71a56813990e1 (diff) | |
make more apps statically linkable
- update libusb to latest upstream
- update bluez to latest upstream
- add a new PKG_OPTS option: libonly, useful for
library only packages, which are not created, when
static linking is choosen
Diffstat (limited to 'package/libiconv')
| -rw-r--r-- | package/libiconv/Config.in | 1 | ||||
| -rw-r--r-- | package/libiconv/Makefile | 18 | ||||
| -rw-r--r-- | package/libiconv/patches/patch-preload_Makefile_in | 16 |
3 files changed, 25 insertions, 10 deletions
diff --git a/package/libiconv/Config.in b/package/libiconv/Config.in index e834bb3d1..6ed1f162c 100644 --- a/package/libiconv/Config.in +++ b/package/libiconv/Config.in @@ -3,7 +3,6 @@ config ADK_PACKAGE_LIBICONV tristate default n help - This package contains a _very_ stripped down version of GNU Libiconv, all charsets have been removed, except ASCII, various unicode charsets and iso8896-1. diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile index 4f3063aad..7c6c70682 100644 --- a/package/libiconv/Makefile +++ b/package/libiconv/Makefile @@ -4,29 +4,29 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libiconv -PKG_VERSION:= 1.13 +PKG_VERSION:= 1.13.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 048032a3032ebd182150bdee30a5d533 +PKG_MD5SUM:= 7ab33ebd26687c744a37264a330bbe9a PKG_DESCR:= character set conversion library PKG_SECTION:= libs PKG_URL:= http://www.gnu.org/software/libiconv PKG_SITES:= ${MASTER_SITE_GNU:=libiconv/} +ifeq ($(ADK_STATIC),y) +PKG_OPTS:= libonly +endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBICONV,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBICONV,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TCFLAGS+= -fPIC -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto FAKE_FLAGS+= libdir="${WRKINST}/usr/lib" \ includedir="${WRKINST}/usr/include" \ INSTALL_TARGET= install-lib -post-extract: - @find ${WRKBUILD} -name *.rej -delete - post-install: ${INSTALL_DIR} ${IDIR_LIBICONV}/usr/lib ${CP} ${WRKINST}/usr/lib/libiconv.so.* ${IDIR_LIBICONV}/usr/lib/ diff --git a/package/libiconv/patches/patch-preload_Makefile_in b/package/libiconv/patches/patch-preload_Makefile_in new file mode 100644 index 000000000..5aa7e91e0 --- /dev/null +++ b/package/libiconv/patches/patch-preload_Makefile_in @@ -0,0 +1,16 @@ +--- 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 + |