diff options
| author | Henning Heinold <heinold@inf.fu-berlin.de> | 2007-07-06 16:21:19 +0000 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2007-07-06 16:21:19 +0000 |
| commit | 4b37859e36525c4902b0f8f22c6cdc6339958171 (patch) | |
| tree | 66dbf908655f25133823b696876e6159745d15ba | |
| parent | 73ae52bc18f5a03690b0ba8ebf21270fb4556a67 (diff) | |
obexftp needed same autotools-love because it depends on libiconv
when compiling with uclibc.
iconv.patch
fix the Makefile.am so it uses libiconv in linker stage
obexftp_0.20.bb
bump PR
make depends on libiconv
| -rw-r--r-- | packages/obexftp/files/iconv.patch | 24 | ||||
| -rw-r--r-- | packages/obexftp/obexftp_0.20.bb | 7 |
2 files changed, 28 insertions, 3 deletions
diff --git a/packages/obexftp/files/iconv.patch b/packages/obexftp/files/iconv.patch new file mode 100644 index 0000000000..83b01a02fe --- /dev/null +++ b/packages/obexftp/files/iconv.patch @@ -0,0 +1,24 @@ +--- obexftp-0.20/obexftp/Makefile.am 2007-06-27 20:33:20.000000000 +0200 ++++ obexftp-0.20/obexftp/Makefile.am 2007-06-27 20:35:05.000000000 +0200 +@@ -4,12 +4,6 @@ + -I$(top_srcdir) \ + -I$(top_srcdir)/includes + +-LDADD = @OPENOBEX_LIBS@ +-# @BLUETOOTH_LIBS@ \ +-# @USB_LIBS@ \ +-# ../multicobex/libmulticobex.la \ +-# ../bfb/libbfb.la +- + obexftpincludedir = $(includedir)/obexftp + + libobexftp_la_SOURCES = object.c object.h \ +@@ -23,6 +17,8 @@ + uuid.h \ + object.h + ++libobexftp_la_LIBADD = @OPENOBEX_LIBS@ @LIBICONV@ ++ + libobexftp_la_LDFLAGS = -version-info $(OBEXFTP_VERSION) + + EXTRA_DIST = client.i diff --git a/packages/obexftp/obexftp_0.20.bb b/packages/obexftp/obexftp_0.20.bb index 23e360bbae..4920ae9eff 100644 --- a/packages/obexftp/obexftp_0.20.bb +++ b/packages/obexftp/obexftp_0.20.bb @@ -2,11 +2,12 @@ DESCRIPTION = "OBEX Ftp Client based on openobex." SECTION = "console/network" HOMEPAGE = "http://openobex.triq.net" LICENSE = "GPL" -DEPENDS = "openobex libgsm" -PR = "r2" +DEPENDS = "openobex libgsm libiconv" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/obexftp-${PV}.tar.gz \ - file://i-hate-libtool.patch;patch=1 \ + file://iconv.patch;patch=1 \ + file://i-hate-libtool.patch;patch=1 \ file://m4.patch;patch=1" inherit autotools |