From 4088c6eaebb868c4533c83a3d7880b9fab31d45e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Nov 2009 18:39:48 +0100 Subject: make obexftp work with static linking, fix ipv6 dependency --- package/Config.in | 1 + package/Makefile | 2 +- package/libpthread/Makefile | 6 +++++- package/obexftp/Config.in | 6 ++++++ package/obexftp/Config.in.lib | 10 ++++++++++ package/obexftp/Makefile | 14 +++++++++++--- package/openobex/Config.in | 5 +++-- package/openobex/Makefile | 6 +++++- 8 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 package/obexftp/Config.in.lib diff --git a/package/Config.in b/package/Config.in index 1fd7c6559..1c9255d6e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -443,6 +443,7 @@ source "package/libnl/Config.in" source "package/libogg/Config.in" source "package/libol/Config.in" source "package/opencdk/Config.in" # libopencdk +source "package/obexftp/Config.in.lib" source "package/openobex/Config.in" source "package/libosip2/Config.in" source "package/libowfat/Config.in" diff --git a/package/Makefile b/package/Makefile index c12cf3067..5f2b1530c 100644 --- a/package/Makefile +++ b/package/Makefile @@ -286,7 +286,7 @@ package-$(ADK_PACKAGE_NFS_KERNEL_NFSD) += nfs-utils package-$(ADK_PACKAGE_NMAP) += nmap package-$(ADK_PACKAGE_NTPCLIENT) += ntpclient package-$(ADK_PACKAGE_NSS) += nss -package-$(ADK_PACKAGE_OBEXFTP) += obexftp +package-$(ADK_COMPILE_OBEXFTP) += obexftp package-$(ADK_PACKAGE_OLSRD) += olsrd package-$(ADK_COMPILE_OPENCDK) += opencdk package-$(ADK_PACKAGE_OPENCT) += openct diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index a70697533..b7ff49f7e 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -18,9 +18,13 @@ PKG_DESCR:= POSIX threading library PKG_SECTION:= libs NO_DISTFILES:= 1 +ifeq ($(ADK_STATIC),y) +PKG_OPTS:= libonly +endif + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) do-install: ${INSTALL_DIR} ${IDIR_LIBPTHREAD}/lib diff --git a/package/obexftp/Config.in b/package/obexftp/Config.in index 97a5f86be..d9e457852 100644 --- a/package/obexftp/Config.in +++ b/package/obexftp/Config.in @@ -1,7 +1,13 @@ +config ADK_COMPILE_OBEXFTP + tristate + default n + depends on ADK_PACKAGE_OBEXFTP + config ADK_PACKAGE_OBEXFTP prompt "obexftp........................... obexftp applications" tristate default n + select ADK_COMPILE_OBEXFTP select ADK_PACKAGE_LIBICONV select ADK_PACKAGE_OPENOBEX help diff --git a/package/obexftp/Config.in.lib b/package/obexftp/Config.in.lib new file mode 100644 index 000000000..8b822f2a4 --- /dev/null +++ b/package/obexftp/Config.in.lib @@ -0,0 +1,10 @@ +config ADK_PACKAGE_LIBOBEXFTP + prompt "libobexftp........................ obexftp libraries" + tristate + default n + select ADK_COMPILE_OBEXFTP + select ADK_PACKAGE_LIBICONV + select ADK_PACKAGE_OPENOBEX + help + http://openobex.triq.net/ + diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile index c3fd175bf..27cc64cf7 100644 --- a/package/obexftp/Makefile +++ b/package/obexftp/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= obexftp PKG_VERSION:= 0.23 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= f20762061b68bc921e80be4aebc349eb PKG_DESCR:= bluetooth ftp application PKG_SECTION:= bluetooth @@ -13,11 +13,18 @@ PKG_DEPENDS:= openobex libiconv PKG_URL:= http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=openobex/} +PKG_DESCR_LIB:= obexftp library +PKG_SECTION_LIB:= libs DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +ifeq ($(ADK_STATIC),y) +PKG_OPTS:= libonly +endif + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,OBEXFTP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBOBEXFTP,libobexftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LIB},${PKG_SECTION_LIB},${PKG_OPTS})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= OPENOBEX_CFLAGS="-I${STAGING_DIR}/usr/include" \ @@ -30,8 +37,9 @@ CONFIGURE_ARGS+= --disable-perl \ INSTALL_STYLE:= auto post-install: - ${INSTALL_DIR} ${IDIR_OBEXFTP}/usr/bin ${IDIR_OBEXFTP}/usr/lib + ${INSTALL_DIR} ${IDIR_OBEXFTP}/usr/bin ${CP} ${WRKINST}/usr/bin/* ${IDIR_OBEXFTP}/usr/bin/ - ${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_OBEXFTP}/usr/lib/ + ${INSTALL_DIR} ${IDIR_LIBOBEXFTP}/usr/lib + ${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_LIBOBEXFTP}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openobex/Config.in b/package/openobex/Config.in index 130dd0361..504459b74 100644 --- a/package/openobex/Config.in +++ b/package/openobex/Config.in @@ -2,8 +2,9 @@ config ADK_PACKAGE_OPENOBEX prompt "openobex.......................... openobex library" tristate default n + # openobex does not work without ipv6 + select ADK_IPV6 select ADK_PACKAGE_BLUEZ help - Free open source implementation of the Object Exchange (OBEX) protocol. - + Open source implementation of the Object Exchange (OBEX) protocol. http://openobex.triq.net/ diff --git a/package/openobex/Makefile b/package/openobex/Makefile index cca11e785..a1fb09a0e 100644 --- a/package/openobex/Makefile +++ b/package/openobex/Makefile @@ -12,9 +12,13 @@ PKG_SECTION:= bluetooth PKG_URL:= http://dev.zuckschwerdt.org/openobex/wiki/WikiStart PKG_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/} +ifeq ($(ADK_STATIC),y) +PKG_OPTS:= libonly +endif + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,OPENOBEX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,OPENOBEX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto -- cgit v1.2.3