summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-11-22 21:11:49 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-11-22 21:11:49 +0100
commita12b122c614b30eb00bf9eece0e9a8907504add1 (patch)
treec6ae9183f8f7c9a9a66271a3866025edb0117e0c /package
parent2ba5a8bb9f383740ab503b79445da1e924665c51 (diff)
make static build work
Diffstat (limited to 'package')
-rw-r--r--package/obexftp/Config.in1
-rw-r--r--package/obexftp/Makefile11
-rw-r--r--package/obexftp/patches/patch-apps_Makefile_in11
3 files changed, 21 insertions, 2 deletions
diff --git a/package/obexftp/Config.in b/package/obexftp/Config.in
index d9e457852..38297b091 100644
--- a/package/obexftp/Config.in
+++ b/package/obexftp/Config.in
@@ -10,5 +10,6 @@ config ADK_PACKAGE_OBEXFTP
select ADK_COMPILE_OBEXFTP
select ADK_PACKAGE_LIBICONV
select ADK_PACKAGE_OPENOBEX
+ select ADK_PACKAGE_LIBOBEXFTP
help
http://openobex.triq.net/
diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile
index 27cc64cf7..55d108e76 100644
--- a/package/obexftp/Makefile
+++ b/package/obexftp/Makefile
@@ -18,7 +18,7 @@ PKG_SECTION_LIB:= libs
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS:= libmix
endif
include ${TOPDIR}/mk/package.mk
@@ -26,6 +26,10 @@ 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}))
+ifeq ($(ADK_STATIC),y)
+XAKE_FLAGS+= STATIC_CFLAGS=-all-static
+endif
+
CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= OPENOBEX_CFLAGS="-I${STAGING_DIR}/usr/include" \
OPENOBEX_LIBS="-L${STAGING_DIR}/usr/lib \
@@ -34,12 +38,15 @@ CONFIGURE_ARGS+= --disable-perl \
--disable-ruby \
--disable-tcl \
--disable-python
+BUILD_STYLE:= auto
INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_OBEXFTP}/usr/bin
- ${CP} ${WRKINST}/usr/bin/* ${IDIR_OBEXFTP}/usr/bin/
+ ${CP} ${WRKINST}/usr/bin/obexftp{,d} ${IDIR_OBEXFTP}/usr/bin/
+ifneq ($(ADK_STATIC),y)
${INSTALL_DIR} ${IDIR_LIBOBEXFTP}/usr/lib
${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_LIBOBEXFTP}/usr/lib/
+endif
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/obexftp/patches/patch-apps_Makefile_in b/package/obexftp/patches/patch-apps_Makefile_in
new file mode 100644
index 000000000..b1b463899
--- /dev/null
+++ b/package/obexftp/patches/patch-apps_Makefile_in
@@ -0,0 +1,11 @@
+--- obexftp-0.23.orig/apps/Makefile.in 2009-02-17 19:28:04.000000000 +0100
++++ obexftp-0.23/apps/Makefile.in 2009-11-22 20:11:46.056591008 +0100
+@@ -77,7 +77,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(STATIC_CFLAGS) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(discovery_SOURCES) $(obexftp_SOURCES) $(obexftpd_SOURCES)
+ DIST_SOURCES = $(discovery_SOURCES) $(obexftp_SOURCES) \