diff options
| author | Cory Fields <theuni-nospam-@xbmc.org> | 2013-06-06 16:16:19 -0400 |
|---|---|---|
| committer | Cory Fields <theuni-nospam-@xbmc.org> | 2013-06-06 16:23:25 -0400 |
| commit | 7225ba9bbb69977d78c574adc00469f1f1c21d68 (patch) | |
| tree | dfd22974b361d9066be9197b9d10c34b97249428 | |
| parent | af5672249375676b45bd6abfc88f7519f7ce75ba (diff) | |
droid: fix libplist not loading due to missing symbols
We can hook up proper iconv support for libxml2 if it proves necessary, though
it has native routines for common conversions, and really shouldn't be
necessary for us.
| -rw-r--r-- | tools/depends/target/libplist/Makefile | 6 | ||||
| -rw-r--r-- | tools/depends/target/libxml2/Makefile | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tools/depends/target/libplist/Makefile b/tools/depends/target/libplist/Makefile index 2d0d3228f6..aa5a9b9fcc 100644 --- a/tools/depends/target/libplist/Makefile +++ b/tools/depends/target/libplist/Makefile @@ -8,7 +8,6 @@ SOURCE=$(LIBNAME)-$(VERSION) FILENAME=v$(VERSION) ARCHIVE=$(SOURCE).tar.gz LIBDYLIB=$(PLATFORM)/build/src/libplist++.so -ICONV=$(shell echo $(LINK_ICONV) | sed -e 's/\-l//') CFLAGS+=-fvisibility=default all: .installed-$(PLATFORM) @@ -16,13 +15,12 @@ $(TARBALLS_LOCATION)/$(ARCHIVE): cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE) $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) - echo $(ICONV) rm -rf $(PLATFORM); mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) cd $(PLATFORM); patch -p1 < ../0001-dontbuildswig.patch - cd $(PLATFORM); sed -ie 's/TARGET_LINK_LIBRARIES( plist /TARGET_LINK_LIBRARIES( plist m z $(ICONV) /' src/CMakeLists.txt + cd $(PLATFORM); sed -ie 's/TARGET_LINK_LIBRARIES( plist /TARGET_LINK_LIBRARIES( plist m z /' src/CMakeLists.txt cd $(PLATFORM); rm -rf build; mkdir -p build - cd $(PLATFORM)/build; $(CMAKE) VERBOSE=1 -DCMAKE_C_FLAGS="$(CFLAGS)" .. + cd $(PLATFORM)/build; $(CMAKE) VERBOSE=1 -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_LD_FLAGS="$(LDFLAGS)" .. $(LIBDYLIB): $(PLATFORM) $(MAKE) -j 1 -C $(PLATFORM)/build VERBOSE=1 diff --git a/tools/depends/target/libxml2/Makefile b/tools/depends/target/libxml2/Makefile index ecce6786cb..17498e5fd3 100644 --- a/tools/depends/target/libxml2/Makefile +++ b/tools/depends/target/libxml2/Makefile @@ -9,7 +9,7 @@ ARCHIVE=$(SOURCE).tar.gz # configuration settings CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \ - ./configure --prefix=$(PREFIX) --without-python --disable-shared + ./configure --prefix=$(PREFIX) --without-python --without-iconv --disable-shared LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME).a |