From 3632f0927f915fb77505f050d275c5a4e2b9c2d6 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sun, 18 Feb 2018 13:17:27 +1100 Subject: [PATCH] alure: fix pkg-config detection and enable shared --- src/alure-1-fixes.patch | 50 +++++++++++++++++++++++++++++++++++++++++ src/alure.mk | 16 ++++++------- 2 files changed, 57 insertions(+), 9 deletions(-) create mode 100644 src/alure-1-fixes.patch diff --git a/src/alure-1-fixes.patch b/src/alure-1-fixes.patch new file mode 100644 index 00000000..3e15e008 --- /dev/null +++ b/src/alure-1-fixes.patch @@ -0,0 +1,50 @@ +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 +Date: Sun, 18 Feb 2018 12:33:24 +1100 +Subject: [PATCH 1/2] fix pkg-config + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,12 +14,12 @@ INCLUDE(CheckIncludeFile) + INCLUDE(CheckIncludeFiles) + INCLUDE(CheckLibraryExists) + INCLUDE(CheckSharedFunctionExists) +-INCLUDE(FindPkgConfig) +-INCLUDE(UsePkgConfig) + INCLUDE(CheckFileOffsetBits) + + PROJECT(ALURE) + ++find_package(PkgConfig) ++ + IF(WIN32) + SET(LIBNAME ALURE32) + ELSE(WIN32) + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sun, 18 Feb 2018 12:51:07 +1100 +Subject: [PATCH 2/2] disable docs + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -497,9 +497,6 @@ ELSE(APPLE) + SET(INCPATH AL) + ENDIF(APPLE) + +-INSTALL(DIRECTORY "${ALURE_SOURCE_DIR}/docs/html" +- DESTINATION share/doc/alure +-) + INSTALL(FILES include/AL/alure.h + DESTINATION "include/${INCPATH}" + ) diff --git a/src/alure.mk b/src/alure.mk index c05808aa..f168a4df 100644 --- a/src/alure.mk +++ b/src/alure.mk @@ -18,15 +18,13 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)/build' && '$(TARGET)-cmake' \ - -DDYNLOAD=OFF \ + cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \ + -DDYNLOAD=$(CMAKE_SHARED_BOOL) \ + -DBUILD_SHARED=$(CMAKE_SHARED_BOOL) \ + -DBUILD_STATIC=$(CMAKE_STATIC_BOOL) \ -DBUILD_EXAMPLES=OFF \ -DFLUIDSYNTH=OFF \ - -DCMAKE_C_FLAGS="-DAL_LIBTYPE_STATIC -DALURE_STATIC_LIBRARY" \ - -DCMAKE_CXX_FLAGS="-DAL_LIBTYPE_STATIC -DALURE_STATIC_LIBRARY" \ - .. - $(MAKE) -C '$(1)/build' -j $(JOBS) VERBOSE=1 - $(MAKE) -C '$(1)/build' -j $(JOBS) install + -DSTATIC_CFLAGS="-DAL_LIBTYPE_STATIC" + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(BUILD_DIR)' -j 1 install endef - -$(PKG)_BUILD_SHARED =