Skip to content

Commit

Permalink
[depends] bump libplist to 2.0.0
Browse files Browse the repository at this point in the history
1.11 removed cmake build system
2.0.0 removed libxml2 dependency
  • Loading branch information
Rechi committed Nov 6, 2017
1 parent e22e099 commit 46bcf9d
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 93 deletions.
2 changes: 1 addition & 1 deletion tools/depends/target/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ libmicrohttpd: gnutls libgcrypt libgpg-error
python27: expat gettext libxml2 sqlite3 openssl libffi
libcdio: $(ICONV)
libcdio-gplv3: $(ICONV)
libplist: libxml2 $(ZLIB)
libplist: $(ZLIB)
libbluray: $(ICONV) libxml2
libssh: libgcrypt openssl $(ZLIB)
mysql: openssl $(ZLIB)
Expand Down
11 changes: 0 additions & 11 deletions tools/depends/target/libplist/0001-dontbuildswig.patch

This file was deleted.

57 changes: 0 additions & 57 deletions tools/depends/target/libplist/0002-fixclang.diff

This file was deleted.

11 changes: 0 additions & 11 deletions tools/depends/target/libplist/0003-fixc++1.patch

This file was deleted.

10 changes: 10 additions & 0 deletions tools/depends/target/libplist/01-disable-tools-tests.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libcnary src include tools test
+SUBDIRS = libcnary src include
if HAVE_CYTHON
SUBDIRS += cython
endif
26 changes: 13 additions & 13 deletions tools/depends/target/libplist/Makefile
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
include ../../Makefile.include
DEPS= ../../Makefile.include 0001-dontbuildswig.patch Makefile
DEPS= ../../Makefile.include Makefile 01-disable-tools-tests.patch

# lib name, version
LIBNAME=libplist
VERSION=1.6
VERSION=2.0.0
SOURCE=$(LIBNAME)-$(VERSION)
FILENAME=v$(VERSION)
ARCHIVE=$(SOURCE).tar.gz
ARCHIVE=$(SOURCE).tar.bz2
ifeq (darwin, $(findstring darwin, $(HOST)))
LIBDYLIB=$(PLATFORM)/build/src/libplist++.dylib
LIBDYLIB=$(PLATFORM)/src/.libs/libplist++.dylib
else
LIBDYLIB=$(PLATFORM)/build/src/libplist++.so
LIBDYLIB=$(PLATFORM)/src/.libs/libplist++.so
endif
CFLAGS+=-fvisibility=default
all: .installed-$(PLATFORM)

# configuration settings
CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; ./configure --prefix=$(PREFIX) --without-cython

$(TARBALLS_LOCATION)/$(ARCHIVE):
cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)

$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
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); patch -p1 < ../0002-fixclang.diff
cd $(PLATFORM); patch -p1 < ../0003-fixc++1.patch
cd $(PLATFORM); sed -ie 's/TARGET_LINK_LIBRARIES( plist \(.*\))/TARGET_LINK_LIBRARIES( plist \1 z m) /' src/CMakeLists.txt
cd $(PLATFORM); rm -rf build; mkdir -p build
cd $(PLATFORM)/build; $(CMAKE) VERBOSE=1 -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_LD_FLAGS="$(LDFLAGS)" ..
cd $(PLATFORM); patch -p1 -i ../01-disable-tools-tests.patch
cd $(PLATFORM); $(AUTORECONF) -vif
cd $(PLATFORM); $(CONFIGURE)

$(LIBDYLIB): $(PLATFORM)
$(MAKE) -j 1 -C $(PLATFORM)/build VERBOSE=1
$(MAKE) -C $(PLATFORM)

.installed-$(PLATFORM): $(LIBDYLIB)
$(MAKE) -C $(PLATFORM)/build install
$(MAKE) -C $(PLATFORM) install
touch $@

clean:
Expand Down

0 comments on commit 46bcf9d

Please sign in to comment.