| Message ID | 1377278794-16469-1-git-send-email-markos.chandras@imgtec.com |
|---|---|
| State | Accepted |
| Headers | show |
>>>>> "Markos" == Markos Chandras <markos.chandras@imgtec.com> writes:
Markos> minidlna will detect and use the libiconv library if
Markos> the package is selected. In that case, we need to link
Markos> against -liconv.
Markos> Fixes the following linking problem:
Markos> taguitils/tagutils.o: In function `do_iconv.constprop.6':
Markos> tagutils.c:(.text+0x4d5c): undefined reference to `libiconv_open'
Markos> tagutils.c:(.text+0x4da0): undefined reference to `libiconv'
Markos> tagutils.c:(.text+0x4e08): undefined reference to `libiconv_close'
Markos> Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Markos> ---
Markos> package/minidlna/minidlna.mk | 11 ++++++++++-
Markos> 1 file changed, 10 insertions(+), 1 deletion(-)
Markos> diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk
Markos> index 10e3b33..e1a56ef 100644
Markos> --- a/package/minidlna/minidlna.mk
Markos> +++ b/package/minidlna/minidlna.mk
Markos> @@ -19,12 +19,21 @@ MINIDLNA_CFLAGS=$(TARGET_CFLAGS) \
Markos> -I"$(STAGING_DIR)/usr/include/libavcodec" \
Markos> -I"$(STAGING_DIR)/usr/include/libavformat"
Markos> +MINIDLNA_COMMON_LIBS=-lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis
We normally add a space around '=' and wrap long lines.
Committed with that fixed, thanks.
diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index 10e3b33..e1a56ef 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -19,12 +19,21 @@ MINIDLNA_CFLAGS=$(TARGET_CFLAGS) \ -I"$(STAGING_DIR)/usr/include/libavcodec" \ -I"$(STAGING_DIR)/usr/include/libavformat" +MINIDLNA_COMMON_LIBS=-lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis + ifeq ($(BR2_PACKAGE_GETTEXT),y) MINIDLNA_DEPENDENCIES += gettext # we need to link with libintl -MINIDLNA_MAKE_OPTS += LIBS='-lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis -lintl' +MINIDLNA_COMMON_LIBS += -lintl +endif + +ifeq ($(BR2_PACKAGE_LIBICONV),y) +MINIDLNA_DEPENDENCIES += libiconv +MINIDLNA_COMMON_LIBS += -liconv endif +MINIDLNA_MAKE_OPTS += LIBS='$(MINIDLNA_COMMON_LIBS)' + define MINIDLNA_BUILD_CMDS PREFIX=$(STAGING_DIR)/usr \ $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
minidlna will detect and use the libiconv library if the package is selected. In that case, we need to link against -liconv. Fixes the following linking problem: taguitils/tagutils.o: In function `do_iconv.constprop.6': tagutils.c:(.text+0x4d5c): undefined reference to `libiconv_open' tagutils.c:(.text+0x4da0): undefined reference to `libiconv' tagutils.c:(.text+0x4e08): undefined reference to `libiconv_close' Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> --- package/minidlna/minidlna.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)