Browse Source

libxerces-c: add missing iconv dependency

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Álvaro Fernández Rojas 10 years ago
parent
commit
0c84690385
1 changed files with 18 additions and 8 deletions
  1. 18
    8
      libs/libxerces-c/Makefile

+ 18
- 8
libs/libxerces-c/Makefile View File

@@ -28,15 +28,28 @@ PKG_INSTALL:=1
28 28
 include $(INCLUDE_DIR)/uclibc++.mk
29 29
 include $(INCLUDE_DIR)/package.mk
30 30
 
31
-CONFIGURE_ARGS += --disable-pretty-make
32
-TARGET_LDFLAGS += -lm
31
+CONFIGURE_ARGS += \
32
+	--disable-pretty-make \
33
+	--enable-transcoder-iconv \
34
+	--enable-netaccessor-socket \
35
+	--enable-msgloader-inmemory
36
+
37
+TARGET_CFLAGS += \
38
+	-I$(STAGING_DIR)/usr/lib/libiconv-full/include
39
+
40
+TARGET_CPPFLAGS += \
41
+	-I$(STAGING_DIR)/usr/lib/libiconv-full/include
42
+
43
+TARGET_LDFLAGS += \
44
+	-L$(STAGING_DIR)/usr/lib/libiconv-full/lib \
45
+	-lm
33 46
 
34 47
 define Package/libxerces-c
35 48
   SECTION:=libs
36 49
   CATEGORY:=Libraries
37 50
   TITLE:=Validating XML parser library for C++
38 51
   URL:=http://xerces.apache.org/
39
-  DEPENDS:=$(CXX_DEPENDS) +libc +libpthread
52
+  DEPENDS:=$(CXX_DEPENDS) +libc +libiconv +libpthread
40 53
 endef
41 54
 
42 55
 define Package/libxerces-c-samples
@@ -73,17 +86,14 @@ define Build/InstallDev
73 86
 	$(INSTALL_DIR) $(1)/usr/include/xercesc/
74 87
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/xercesc/* $(1)/usr/include/xercesc/
75 88
 	$(INSTALL_DIR) $(1)/usr/lib
76
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxerces-c.a $(1)/usr/lib/
77
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxerces-c-3.1.so $(1)/usr/lib/
78
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxerces-c.so $(1)/usr/lib/
89
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/{libxerces-c.a,libxerces-c-3.1.so,libxerces-c.so} $(1)/usr/lib/
79 90
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
80 91
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/xerces-c.pc $(1)/usr/lib/pkgconfig/xerces-c.pc
81 92
 endef
82 93
 
83 94
 define Package/libxerces-c/install
84 95
 	$(INSTALL_DIR) $(1)/usr/lib
85
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxerces-c-3.1.so $(1)/usr/lib/
86
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxerces-c.so $(1)/usr/lib/
96
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/{libxerces-c-3.1.so,libxerces-c.so} $(1)/usr/lib/
87 97
 endef
88 98
 
89 99
 define Package/libxerces-c-samples/install