Ticket #1198: mythtv_configure.2.diff

File mythtv_configure.2.diff, 7.3 KB (added by mythtv@…, 15 years ago)

A full patch to support lib64 libdir names (remains optional)

  • configure

     
    2020# default parameters
    2121compile_type="release"
    2222prefix="/usr/local"
     23libdir_name="lib"
    2324libdir=""
    2425mandir=""
    2526bindir=""
     
    9697echo "  --compile-type=CTYPE     one of release, profile, debug [$compile_type]"
    9798echo "                           NOTE: profile is for sampling profilers"
    9899echo "  --prefix=PREFIX          install in PREFIX [$prefix]"
     100echo "  --libdir-name=LIBNAME    install libs in PREFIX/LIBNAME [$libdir_name]"
    99101#echo "  --libdir=DIR             install libs in DIR [PREFIX/lib]"
    100102#echo "  --mandir=DIR             man documentation in DIR [PREFIX/man]"
    101103echo "  --disable-ccache         disable compiler cache (ccache)"
     
    606608  ;; 
    607609  --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`; force_prefix=yes
    608610  ;;
     611  --libdir-name=*) libdir_name=`echo $opt | cut -d '=' -f 2`;
     612  ;;
    609613  --libdir=*) libdir=`echo $opt | cut -d '=' -f 2`; force_prefix=yes
    610614  ;;
    611615  --mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
     
    889893        done
    890894    fi
    891895
    892     LIBPATHS="`echo $LIBPATHS /lib /usr/lib /usr/local/lib /usr/X11R6/lib | sed s/'\/ '/' '/g` "
     896    LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
    893897
    894898    HAS_IT="no"
    895899    for LIBPATH in $LIBPATHS ; do
     
    904908{
    905909    HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include"
    906910    INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g`
    907     HPATHS="$HPATHS `echo $INCL | sed s/lib/include/g` "
     911    HPATHS="$HPATHS `echo $INCL | sed s,$libdir_name,include,g` "
    908912
    909913    HAS_IT="no"
    910914    for HPATH in $HPATHS ; do
     
    22322236echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
    22332237
    22342238echo "PREFIX=$prefix" >> $MYTH_CONFIG_MAK
     2239echo "LIBDIR_NAME=$libdir_name" >> $MYTH_CONFIG_MAK
    22352240#echo "libdir=$libdir" >> $MYTH_CONFIG_MAK
    22362241#echo "bindir=$bindir" >> $MYTH_CONFIG_MAK
    22372242#echo "mandir=$mandir" >> $MYTH_CONFIG_MAK
  • libs/libmythtv/libmythtv.pro

     
    44TEMPLATE = lib
    55TARGET = mythtv-$$LIBVERSION
    66CONFIG += thread dll
    7 target.path = $${PREFIX}/lib
     7target.path = $${PREFIX}/$${LIBDIR_NAME}
    88INSTALLS = target
    99
    1010INCLUDEPATH += ../.. ..
  • libs/libmythmpeg2/libmythmpeg2.pro

     
    44TEMPLATE = lib
    55TARGET = mythmpeg2-$$LIBVERSION
    66CONFIG += thread staticlib warn_off
    7 target.path = $${PREFIX}/lib
     7target.path = $${PREFIX}/$${LIBDIR_NAME}
    88INSTALLS = target
    99
    1010QMAKE_CFLAGS_RELEASE += -DPIC -fPIC -fno-common
  • libs/libmythsoundtouch/libmythsoundtouch.pro

     
    44TEMPLATE = lib
    55TARGET = mythsoundtouch-$$LIBVERSION
    66CONFIG += thread staticlib warn_off
    7 target.path = $${PREFIX}/lib
     7target.path = $${PREFIX}/$${LIBDIR_NAME}
    88INSTALLS = target
    99
    1010INCLUDEPATH += ../../libs/libavcodec ../..
  • libs/libavformat/libavformat.pro

     
    44TEMPLATE = lib
    55TARGET = mythavformat-$$LIBVERSION
    66CONFIG += thread dll warn_off
    7 target.path = $${PREFIX}/lib
     7target.path = $${PREFIX}/$${LIBDIR_NAME}
    88INSTALLS = target
    99
    1010INCLUDEPATH += ../ ../../ ../libavcodec ../libavutil ../libmythtv
  • libs/libmythsamplerate/libmythsamplerate.pro

     
    44TEMPLATE = lib
    55TARGET = mythsamplerate-$$LIBVERSION
    66CONFIG += thread staticlib warn_off
    7 target.path = $${PREFIX}/lib
     7target.path = $${PREFIX}/$${LIBDIR_NAME}
    88INSTALLS = target
    99
    1010INCLUDEPATH += ../../
  • libs/libmythui/libmythui.pro

     
    44TEMPLATE = lib
    55TARGET = mythui-$$LIBVERSION
    66CONFIG += debug thread dll
    7 target.path = $${PREFIX}/lib
     7target.path = $${PREFIX}/$${LIBDIR_NAME}
    88INSTALLS = target
    99
    1010INCLUDEPATH += ../libmyth
  • libs/libmyth/libmyth.pro

     
    44TEMPLATE = lib
    55TARGET = myth-$$LIBVERSION
    66CONFIG += thread dll
    7 target.path = $${PREFIX}/lib
     7target.path = $${PREFIX}/$${LIBDIR_NAME}
    88INSTALLS = target
    99
    1010QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
  • libs/libmyth/mythcontext.cpp

     
    11201120
    11211121QString MythContext::GetLibraryDir(void)
    11221122{
    1123     return d->m_installprefix + "/lib/mythtv/";
     1123    return d->m_installprefix + "/" + LIBDIR_NAME + "/mythtv/";
    11241124}
    11251125
    11261126QString MythContext::GetThemesParentDir(void)
  • libs/libavcodec/libavcodec.pro

     
    44TEMPLATE = lib
    55TARGET = mythavcodec-$$LIBVERSION
    66CONFIG += thread dll warn_off
    7 target.path = $${PREFIX}/lib
     7target.path = $${PREFIX}/$${LIBDIR_NAME}
    88INSTALLS = target
    99
    1010INCLUDEPATH = ../ ../../ ../libavutil
  • libs/libavutil/libavutil.pro

     
    55TARGET = mythavutil-$$LIBVERSION
    66CONFIG += thread dll warn_off
    77CONFIG -= qt
    8 target.path = $${PREFIX}/lib
     8target.path = $${PREFIX}/$${LIBDIR_NAME}
    99INSTALLS = target
    1010
    1111INCLUDEPATH = ../ ../../
  • settings.pro

     
    44    PREFIX = /usr/local
    55}
    66
     7isEmpty( LIBDIR_NAME ) {
     8    LIBDIR_NAME = lib
     9}
     10
    711LIBVERSION = 0.19
    812VERSION = 0.19.0
    913
     
    5660DEFINES += _GNU_SOURCE
    5761DEFINES += _FILE_OFFSET_BITS=64
    5862DEFINES += PREFIX=\"$${PREFIX}\"
     63DEFINES += LIBDIR_NAME=\"$${LIBDIR_NAME}\"
    5964
    6065# construct linking path
    6166
  • filters/filter-common.pro

     
    44TEMPLATE = lib
    55CONFIG -= moc qt
    66CONFIG += plugin thread
    7 target.path = $${PREFIX}/lib/mythtv/filters
     7target.path = $${PREFIX}/$${LIBDIR_NAME}/mythtv/filters
    88INSTALLS = target
    99
    1010QMAKE_CFLAGS_RELEASE += -Wno-missing-prototypes