source: trunk/dports/aqua/qt4-mac/files/patch-configure-arch.diff @ 72571

Last change on this file since 72571 was 72571, checked in by michaelld@…, 7 years ago

qt4-mac:

  • Addresses tickets #26646 and #26768.
  • Update Qt to 4.7.0.
  • Split "find -E" into 2 finds.
  • Rework setting of ARCHs, MACOSX_DEPLOYMENT_TARGET, SDK, and others.
  • Move Qt into ${prefix}.
  • Add qt4 portgroup to handle common qt4 parameters.
  • remove need for qt4_select; select 'none' when activating this port.
  • do not install Phonon; leave that to the Phonon port, since it is more up-to-date than that provided here. Allows for KDE ports to be upgraded to the 4.5 series individually.
  • remove qaudio patches, since they were incorporated into the release.
  • do not install as framework, only as separate libraries / headers; 'archcheck' can now be performed on Qt's libraries.
  • add in archcheck to all dependencies.
  • add postgresql variants for versions 83, 84, 90, and 91.
  • build optimized qmake if building for the native arch (and not otherwise).
  • add in stub variants for +x11 and +quartz; will fill in details later.
  • Fix import and plugin library ID (self name).
  • various small tweaks.
File size: 1.3 KB
  • (a) configure_orig vs. (b) configure

    a b  
    45674567            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
    45684568            EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
    45694569            EXTRA_SRCS="\"$relpath/src/corelib/io/qsettings_mac.cpp\" \"$relpath/src/corelib/kernel/qcore_mac.cpp\""
    4570             if echo "$CFG_MAC_ARCHS" | grep x86 > /dev/null 2>&1; then # matches both x86 and x86_64
    4571                 X86_CFLAGS="-arch i386"
    4572                 X86_LFLAGS="-arch i386"
    4573                 EXTRA_CFLAGS="$X86_CFLAGS $EXTRA_CFLAGS"
    4574                 EXTRA_CXXFLAGS="$X86_CFLAGS $EXTRA_CXXFLAGS"
    4575                 EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS"
    4576             fi
    4577             if echo "$CFG_MAC_ARCHS" | grep ppc > /dev/null 2>&1; then # matches both ppc and ppc64
    4578                 PPC_CFLAGS="-arch ppc"
    4579                 PPC_LFLAGS="-arch ppc"
    4580                 EXTRA_CFLAGS="$PPC_CFLAGS $EXTRA_CFLAGS"
    4581                 EXTRA_CXXFLAGS="$PPC_CFLAGS $EXTRA_CXXFLAGS"
    4582                 EXTRA_LFLAGS="$EXTRA_LFLAGS $PPC_LFLAGS"
    4583             fi
     4570            X86_CFLAGS="-arch @ARCHES@"
     4571            X86_LFLAGS="-arch @ARCHES@"
     4572            EXTRA_CFLAGS="$X86_CFLAGS $EXTRA_CFLAGS"
     4573            EXTRA_CXXFLAGS="$X86_CFLAGS $EXTRA_CXXFLAGS"
     4574            EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS"
    45844575            if [ '!' -z "$CFG_SDK" ]; then
    45854576                echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
    45864577                echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
Note: See TracBrowser for help on using the repository browser.