Ticket #11170: 0001-Fix-Windows-cross-compile-of-MythTV-0.26-on-Linux.patch

File 0001-Fix-Windows-cross-compile-of-MythTV-0.26-on-Linux.patch, 3.5 KB (added by Lawrence Rust <lvr@…>, 12 years ago)

  • mythtv/configure 

    From 9e52f921960b5a40c22bea2e0c409e35c75f8d26 Mon Sep 17 00:00:00 2001
From: Lawrence Rust <lvr@softsystem.co.uk>
Date: Wed, 10 Oct 2012 20:47:33 +0200
Subject: [PATCH] Fix Windows cross-compile of MythTV 0.26 on Linux

Signed-off-by: Lawrence Rust <lvr@softsystem.co.uk>
---
 mythtv/configure                    |    3 +++
 mythtv/external/Makefile            |   14 +++++++++++---
 mythtv/external/nzmqt/src/nzmqt.pro |    5 +++++
 mythtv/external/qjson/src/src.pro   |    8 +++++++-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/mythtv/configure b/mythtv/configure
index 27958e1..19900a8 100755
    a b QMAKE_LIBDIR-=${sysroot}${libdir} 
    54295429LATE_LIBS+=-L${sysroot}${libdir}
    54305430EOF
    54315431
     5432# Save the cross-prefix for external configure scripts
     5433[ -n "$cross_prefix" ] && echo "XPREFIX=${cross_prefix%-}" >> $TMPMAK
     5434
    54325435#echo "endif # FFMPEG_CONFIG_MAK" >> $TMPMAK
    54335436
    54345437# Should be done on all platforms, but for the time being limit it to mac only

  • mythtv/external/Makefile 

    diff --git a/mythtv/external/Makefile b/mythtv/external/Makefile
index 6fc0c2e..0323f2a 100644
    a b SUBDIRS_UNINSTALL = $(addsuffix -uninstall, ${SUBDIRS}) 
    88SUBDIRS_CLEAN = $(addsuffix -clean, ${SUBDIRS})
    99SUBDIRS_DISTCLEAN = $(addsuffix -distclean, ${SUBDIRS})
    1010
     11ZEROMQ_CONFIG = --prefix=${PREFIX}
     12ZEROMQ_CONFIG += --includedir=${PREFIX}/include/mythtv/zeromq
     13ZEROMQ_CONFIG += --without-documentation
     14ifdef XBUILD
     15ZEROMQ_CONFIG += --build=${XBUILD}
     16endif
     17ifdef XPREFIX
     18ZEROMQ_CONFIG += --host=${XPREFIX}
     19endif
     20
    1121default:        all
    1222all:            ${SUBDIRS_ALL}
    1323install:        ${SUBDIRS_INSTALL}
    … … zeromq-all: zeromq/Makefile 
    2333        ${MAKE} -C zeromq all
    2434
    2535zeromq/Makefile:        zeromq/configure
    26         (cd zeromq ; \
    27          ./configure --without-documentation --prefix=${PREFIX} \
    28                      --includedir=${PREFIX}/include/mythtv/zeromq)
     36        (cd zeromq ; ./configure ${ZEROMQ_CONFIG} )
    2937
    3038zeromq-install zeromq-uninstall zeromq-clean zeromq-distclean:
    3139        ${MAKE} -C zeromq ${@:zeromq-%=%} DESTDIR=${INSTALL_ROOT}

  • mythtv/external/nzmqt/src/nzmqt.pro 

    diff --git a/mythtv/external/nzmqt/src/nzmqt.pro b/mythtv/external/nzmqt/src/nzmqt.pro
index 45dc1d4..947457f 100644
    a b INSTALLS = target 
    1313
    1414TEMPLATE = lib
    1515
     16# Windows doesn't have a nice variable like LD_LIBRARY_PATH,
     17# which means make install would be broken without extra steps.
     18# As a workaround, we store dlls with exes. Also improves debugging!
     19windows: target.path = $${PREFIX}/bin
     20
    1621QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
    1722
    1823SOURCES += \

  • mythtv/external/qjson/src/src.pro 

    diff --git a/mythtv/external/qjson/src/src.pro b/mythtv/external/qjson/src/src.pro
index 7859c38..8cd25e1 100644
    a b TARGET = mythqjson 
    99target.path = $${LIBDIR}
    1010DESTDIR  = $$QJSON_BASE/lib
    1111#CONFIG += create_prl
     12CONFIG += dll
    1213INSTALLS = target
    1314
    1415!mingw {
    … … INSTALLS = target 
    1718
    1819windows: {
    1920  DEFINES += QJSON_MAKEDLL
     21
     22    # Windows doesn't have a nice variable like LD_LIBRARY_PATH,
     23    # which means make install would be broken without extra steps.
     24    # As a workaround, we store dlls with exes. Also improves debugging!
     25    #
     26    target.path = $${PREFIX}/bin
    2027}
    2128
    2229# MythTV OS X build fix. We want a dynamic library (like all our other libs),
    … … cppinc.files += $${PUBLIC_CPPHEADERS} 
    96103cppinc.path  += $${PREFIX}/include/mythtv/QJson/
    97104
    98105INSTALLS += cppinc
    99