From 24faa2fd26587f8c8a8985a35ce11d02bd91c1c6 Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Wed, 15 Aug 2018 22:20:45 -1000 Subject: Make libpar2 compile --- data/libpar2/make.sh | 5 +++-- data/libpar2/pkgconfig.diff | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 data/libpar2/pkgconfig.diff diff --git a/data/libpar2/make.sh b/data/libpar2/make.sh index 452a4bfd5..814ddbb6b 100644 --- a/data/libpar2/make.sh +++ b/data/libpar2/make.sh @@ -1,4 +1,5 @@ pkg:setup -pkg:configure -make +autoreconf -f -i +PKG_CONFIG="$(realpath "${PKG_BASE}/util/pkg-config.sh")" ./configure ac_cv_prog_cc_g=no ac_cv_prog_cxx_g=no --build="$(${PKG_BASE}/util/config.guess)" --host="${PKG_TARG}" --enable-static=no --enable-shared=yes --prefix="$(cat "${PKG_BASE}/arch/${PKG_ARCH}/prefix")" --localstatedir="/var/cache/${PKG_NAME}" CFLAGS="-O2 -fno-common" CXXFLAGS="-O2 -fno-common -std=c++11" +make -j8 pkg:install diff --git a/data/libpar2/pkgconfig.diff b/data/libpar2/pkgconfig.diff new file mode 100644 index 000000000..8ba03b688 --- /dev/null +++ b/data/libpar2/pkgconfig.diff @@ -0,0 +1,21 @@ +diff -ur libpar2-0.2/Makefile.am libpar2-0.2+iPhone/Makefile.am +--- libpar2-0.2/Makefile.am 2006-02-26 11:40:08.000000000 -1000 ++++ libpar2-0.2+iPhone/Makefile.am 2018-08-15 22:08:05.000000000 -1000 +@@ -47,8 +47,8 @@ + verificationhashtable.cpp verificationhashtable.h \ + verificationpacket.cpp verificationpacket.h + +-LDADD = -lstdc++ -lsigc-2.0 +-INCLUDES = `pkg-config sigc++-2.0 --cflags` ++LDADD = $(SIGC_LIBS) ++INCLUDES = $(SIGC_CFLAGS) + AM_CXXFLAGS = -Wall + + EXTRA_DIST = PORTING ROADMAP debian/changelog debian/compat debian/control \ +@@ -68,4 +68,4 @@ + libpar2_configdir = $(libdir)/libpar2/include + libpar2_config_DATA = config.h + +-libpar2_la_LDFLAGS = -version-info 0:1:0 +\ No newline at end of file ++libpar2_la_LDFLAGS = -version-info 0:1:0 -- cgit v1.2.3