diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/libupnp | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/libupnp')
| -rw-r--r-- | package/libupnp/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile index 18eda96b6..092c371f8 100644 --- a/package/libupnp/Makefile +++ b/package/libupnp/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= libupnp PKG_VERSION:= 1.6.19 PKG_RELEASE:= 1 PKG_MD5SUM:= ee16e5d33a3ea7506f38d71facc057dd -PKG_DESCR:= The Universal Plug and Play (UPnP) SDK library -PKG_SECTION:= libs +PKG_DESCR:= universal plug and play sdk library +PKG_SECTION:= libs/net PKG_BUILDDEP:= autotool PKG_DEPENDS:= libpthread PKG_URL:= http://pupnp.sourceforge.net/ @@ -22,7 +22,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBUPNP,libupnp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) AUTOTOOL_STYLE:= autoreconf -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) TARGET_CFLAGS+= -fPIC CONFIGURE_ARGS+= --disable-samples |