diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/obexftp/Config.in | 1 | ||||
| -rw-r--r-- | package/obexftp/Makefile | 11 | ||||
| -rw-r--r-- | package/obexftp/patches/patch-apps_Makefile_in | 11 | ||||
| -rw-r--r-- | package/strace/patches/patch-linux_arm_syscallent_h | 15 | ||||
| -rw-r--r-- | package/strace/patches/patch-system_c | 11 |
5 files changed, 47 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) \ diff --git a/package/strace/patches/patch-linux_arm_syscallent_h b/package/strace/patches/patch-linux_arm_syscallent_h new file mode 100644 index 000000000..387490267 --- /dev/null +++ b/package/strace/patches/patch-linux_arm_syscallent_h @@ -0,0 +1,15 @@ +--- strace-4.5.18.orig/linux/arm/syscallent.h 2008-07-18 03:23:49.000000000 +0200 ++++ strace-4.5.18/linux/arm/syscallent.h 2009-11-22 21:27:48.660576873 +0100 +@@ -431,6 +431,7 @@ + { 5, 0, printargs, "SYS_398" }, /* 398 */ + { 5, 0, printargs, "SYS_399" }, /* 399 */ + ++#ifndef __ARM_EABI__ + #if SYS_socket_subcall != 400 + #error fix me + #endif +@@ -481,3 +482,4 @@ + { 4, TI, sys_shmdt, "shmdt" }, /* 440 */ + { 4, TI, sys_shmget, "shmget" }, /* 441 */ + { 4, TI, sys_shmctl, "shmctl" }, /* 442 */ ++#endif diff --git a/package/strace/patches/patch-system_c b/package/strace/patches/patch-system_c new file mode 100644 index 000000000..85ad4a434 --- /dev/null +++ b/package/strace/patches/patch-system_c @@ -0,0 +1,11 @@ +--- strace-4.5.18.orig/system.c 2007-01-17 00:22:36.000000000 +0100 ++++ strace-4.5.18/system.c 2009-11-22 21:29:57.404591477 +0100 +@@ -70,7 +70,7 @@ + #include <linux/capability.h> + #endif + +-#ifdef SYS_cacheflush ++#if defined SYS_cacheflush && !defined ARM + #include <asm/cachectl.h> + #endif + |