diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-03-26 05:01:19 (GMT) |
|---|---|---|
| committer | Boris Pek <tehnick-8@yandex.ru> | 2017-03-29 09:55:16 (GMT) |
| commit | 946dbbec0f5dc5eb144b26b29da771e5dde37c69 (patch) | |
| tree | b673c4049d80b6df0098f129fd128ec48e12ffc0 | |
| parent | 68f5df67445b142c2948f7b013402b8ec4939aee (diff) | |
| download | mxe-946dbbec0f5dc5eb144b26b29da771e5dde37c69.zip mxe-946dbbec0f5dc5eb144b26b29da771e5dde37c69.tar.gz mxe-946dbbec0f5dc5eb144b26b29da771e5dde37c69.tar.bz2 | |
qca: install pkg-config file and add test
N.B. test fails with undefined references
| -rw-r--r-- | src/qca-1-fixes.patch | 23 | ||||
| -rw-r--r-- | src/qca.mk | 8 |
2 files changed, 31 insertions, 0 deletions
diff --git a/src/qca-1-fixes.patch b/src/qca-1-fixes.patch new file mode 100644 index 0000000..ee43168 --- /dev/null +++ b/src/qca-1-fixes.patch @@ -0,0 +1,23 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore <tonyt@logyst.com> +Date: Sun, 26 Mar 2017 12:36:55 +1100 +Subject: [PATCH] qca: add INSTAL_PKGCONFIG option + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -233,7 +233,7 @@ foreach(PATH QCA_PLUGINS_INSTALL_DIR + endif() + endforeach() + +-if(NOT WIN32) ++if(NOT WIN32 OR INSTAL_PKGCONFIG) + if(OSX_FRAMEWORK) + set(PKGCONFIG_CFLAGS "-F\${libdir} -I\${includedir}") + set(PKGCONFIG_LIBS "-F\${libdir} -framework ${QCA_LIB_NAME}") @@ -15,6 +15,7 @@ define $(PKG)_BUILD -DBUILD_TOOLS=OFF \ -DUSE_RELATIVE_PATHS=OFF \ -DBUILD_PLUGINS="auto" \ + -DINSTAL_PKGCONFIG=ON \ -DQCA_MAN_INSTALL_DIR="$(BUILD_DIR)/null" $(MAKE) -C '$(BUILD_DIR)' -j $(JOBS) $(MAKE) -C '$(BUILD_DIR)' -j 1 install @@ -24,5 +25,12 @@ define $(PKG)_BUILD cd '$(BUILD_DIR)/test-qca' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qca-test.pro' $(MAKE) -C '$(BUILD_DIR)/test-qca' -j $(JOBS) $(BUILD_TYPE) $(INSTALL) -m755 '$(BUILD_DIR)/test-qca/$(BUILD_TYPE)/test-qca5.exe' '$(PREFIX)/$(TARGET)/bin/') + + # compile test + '$(TARGET)-g++' \ + -W -Wall -Werror \ + '$(SOURCE_DIR)/examples/base64test/base64test.cpp' \ + -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ + `'$(TARGET)-pkg-config' qca2-qt5 --cflags --libs` endef |