diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-10-22 22:15:59 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-10-22 22:15:59 +0200 |
| commit | 1d18ffa427852084c6bf378eaa76c2e9116cdea7 (patch) | |
| tree | b9aa383048f908be017cdc260cb60fa3df5699e0 /package/libiconv/Makefile | |
| parent | f3d0f13c125a7e24dda986656d42b4a28e2f8e70 (diff) | |
| parent | 4f14ea9a70f86fd29c59b617fa1449dd5b2f14ab (diff) | |
some adk devel corrections
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
mk/package.mk
Diffstat (limited to 'package/libiconv/Makefile')
| -rw-r--r-- | package/libiconv/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
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/ |