[oe-commits] org.oe.dev merge of 'cdfb16fa120107504979a268988c8e742fb9ee27'
rwhitby commit
openembedded-commits at lists.openembedded.org
Thu Jun 21 17:40:36 UTC 2007
merge of 'cdfb16fa120107504979a268988c8e742fb9ee27'
and 'fa1c000d2eb11e81b0552935ffbdfcbf497dde8a'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 8b37dea089f02d115ec3e3af14478ea8264ad822
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8b37dea089f02d115ec3e3af14478ea8264ad822
Files:
1
packages/ossie/ossie-c-wavloader_svn.bb
packages/ossie/ossie-channeldemo_svn.bb
packages/ossie/ossie-demo_svn.bb
packages/ossie/ossie-gpp-device_svn.bb
packages/ossie/ossie-interpolator_svn.bb
packages/ossie/ossie-modulator_svn.bb
packages/ossie/ossie-nodebooter_svn.bb
packages/ossie/ossie-randombits_svn.bb
packages/ossie/ossie-rxdemo_svn.bb
packages/ossie/ossie-sigproc_svn.bb
packages/ossie/ossie-soundout-device_svn.bb
packages/ossie/ossie-standardinterfaces_svn.bb
packages/ossie/ossie-tx-random-data_svn.bb
packages/ossie/ossie-usrp-device_svn.bb
packages/ossie/ossie-usrp-tx-control_svn.bb
packages/ossie/ossiecf_svn.bb
packages/tasks/task-ossie.bb
packages/gaim/pidgin_2.0.0.bb
packages/gaim/pidgin_2.0.1.bb
packages/qt/qt4-x11-free-4.1.2/cross-compile.patch
packages/qt/qt4-x11-free-4.3.0/0001-cross-compile.patch
packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch
packages/qt/qt4-x11-free-4.3.0/0005-fix-mkspecs.patch
packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch
packages/qt/qt4-x11-free-4.3.0/0002-fix-resinit-declaration.patch
packages/qt/qt4-x11-free-4.1.2/no-qmake.patch
packages/qt/qt4-x11-free-4.3.0/0004-no-qmake.patch
packages/qt/qt4-x11-free-4.1.2/no-tools.patch
packages/qt/qt4-x11-free-4.3.0/0003-no-tools.patch
packages/qt/qt4-x11-free_4.1.2.bb
packages/qt/qt4-x11-free_4.3.0.bb
packages/uicmoc/uicmoc4-native_4.2.3.bb
packages/uicmoc/uicmoc4-native_4.3.0.bb
packages/qt/qt4-x11-free-4.3.0
packages/salsa-lib
packages/qt/qt4-x11-free-4.3.0/0006-freetype-host-includes.patch
packages/qt/qt4-x11-free-4.3.0/0007-openssl-host-includes.patch
packages/qt/qt4_arch.inc
packages/salsa-lib/salsa-lib_0.0.1.bb
packages/wpa-supplicant/files/functions.sh
packages/wpa-supplicant/files/ifupdown.sh
classes/insane.bbclass
conf/checksums.ini
conf/distro/angstrom-2007.1.conf
conf/machine/gumstix.conf
packages/liba52/liba52_0.7.4.bb
packages/linux/linux-omap1-2.6.20-omap1/defconfig.eabi
packages/linux/linux-rp-2.6.20/defconfig-collie
packages/linux/linux-rp_2.6.20.bb
packages/linux/xanadux-ba-2.6_2.6.12.bb
packages/linux/xanadux-un-2.6_2.6.12.bb
packages/slugos-init/files/turnup
packages/slugos-init/slugos-init_0.10.bb
packages/wpa-supplicant/wpa-supplicant-0.5.inc
packages/wpa-supplicant/wpa-supplicant_0.5.5.bb
packages/wpa-supplicant/wpa-supplicant_0.5.7.bb
mtn:execute
true
Diffs:
#
# mt diff -rcdfb16fa120107504979a268988c8e742fb9ee27 -r8b37dea089f02d115ec3e3af14478ea8264ad822
#
#
#
# delete "packages/ossie/ossie-c-wavloader_svn.bb"
#
# delete "packages/ossie/ossie-channeldemo_svn.bb"
#
# delete "packages/ossie/ossie-demo_svn.bb"
#
# delete "packages/ossie/ossie-gpp-device_svn.bb"
#
# delete "packages/ossie/ossie-interpolator_svn.bb"
#
# delete "packages/ossie/ossie-modulator_svn.bb"
#
# delete "packages/ossie/ossie-nodebooter_svn.bb"
#
# delete "packages/ossie/ossie-randombits_svn.bb"
#
# delete "packages/ossie/ossie-rxdemo_svn.bb"
#
# delete "packages/ossie/ossie-sigproc_svn.bb"
#
# delete "packages/ossie/ossie-soundout-device_svn.bb"
#
# delete "packages/ossie/ossie-standardinterfaces_svn.bb"
#
# delete "packages/ossie/ossie-tx-random-data_svn.bb"
#
# delete "packages/ossie/ossie-usrp-device_svn.bb"
#
# delete "packages/ossie/ossie-usrp-tx-control_svn.bb"
#
# delete "packages/ossie/ossiecf_svn.bb"
#
# delete "packages/tasks/task-ossie.bb"
#
# rename "packages/gaim/pidgin_2.0.0.bb"
# to "packages/gaim/pidgin_2.0.1.bb"
#
# rename "packages/qt/qt4-x11-free-4.1.2/cross-compile.patch"
# to "packages/qt/qt4-x11-free-4.3.0/0001-cross-compile.patch"
#
# rename "packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch"
# to "packages/qt/qt4-x11-free-4.3.0/0005-fix-mkspecs.patch"
#
# rename "packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch"
# to "packages/qt/qt4-x11-free-4.3.0/0002-fix-resinit-declaration.patch"
#
# rename "packages/qt/qt4-x11-free-4.1.2/no-qmake.patch"
# to "packages/qt/qt4-x11-free-4.3.0/0004-no-qmake.patch"
#
# rename "packages/qt/qt4-x11-free-4.1.2/no-tools.patch"
# to "packages/qt/qt4-x11-free-4.3.0/0003-no-tools.patch"
#
# rename "packages/qt/qt4-x11-free_4.1.2.bb"
# to "packages/qt/qt4-x11-free_4.3.0.bb"
#
# rename "packages/uicmoc/uicmoc4-native_4.2.3.bb"
# to "packages/uicmoc/uicmoc4-native_4.3.0.bb"
#
# add_dir "packages/qt/qt4-x11-free-4.3.0"
#
# add_dir "packages/salsa-lib"
#
# add_file "packages/qt/qt4-x11-free-4.1.2/cross-compile.patch"
# content [baef2c973d3f167a15da5591f384f46ac97e9568]
#
# add_file "packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch"
# content [be9c0987b2555dbe59c11e9ee4717394d28a23c6]
#
# add_file "packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch"
# content [290ead1081e92cf5f040fa1f37108b10e466d853]
#
# add_file "packages/qt/qt4-x11-free-4.1.2/no-qmake.patch"
# content [5c958d83e74daad2e0496134d0f6d4ca3509b26e]
#
# add_file "packages/qt/qt4-x11-free-4.1.2/no-tools.patch"
# content [24c14cb5bf5bc4d4041040de4d373f6e081101cb]
#
# add_file "packages/qt/qt4-x11-free-4.3.0/0006-freetype-host-includes.patch"
# content [3570223a649acdeb59d0a0d14207bea417a9c8b5]
#
# add_file "packages/qt/qt4-x11-free-4.3.0/0007-openssl-host-includes.patch"
# content [a1b4e6415d9a946ffd9c11915b871187c76f8245]
#
# add_file "packages/qt/qt4-x11-free_4.1.2.bb"
# content [6f37f072d6f0ee744fb3b14a36b451bfb7f15d39]
#
# add_file "packages/qt/qt4_arch.inc"
# content [8912a21d98b8e45e7143daad589738537496a81a]
#
# add_file "packages/salsa-lib/salsa-lib_0.0.1.bb"
# content [f70cb6cfcbcb8f064ebe1556bd9575fb84b21d11]
#
# add_file "packages/uicmoc/uicmoc4-native_4.2.3.bb"
# content [bb258bfafd5b03ee012d8e4530a8f4219b862463]
#
# add_file "packages/wpa-supplicant/files/functions.sh"
# content [ed78208ccca7bf23e6053cdfb813181c7468b36b]
#
# add_file "packages/wpa-supplicant/files/ifupdown.sh"
# content [bf97ff82523a320ea144450649c93adc6e67ab02]
#
# patch "classes/insane.bbclass"
# from [a390bc2fb4efa55feff3e0eadc4a1d14185e9e81]
# to [02d91727c1f0f883c42d47be353bf1df801a8da6]
#
# patch "conf/checksums.ini"
# from [74c8d479ebb6de3a1b84719d04b4eaac8a9e89f6]
# to [489019a99868b947cd11c9e930dc6a5cd380522d]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [e5095a19e47c76d68b4a0c4a90f890738d24b8fd]
# to [5a33e5de0027e06d005b28771b59efd5b2e3286d]
#
# patch "conf/machine/gumstix.conf"
# from [74c50d1c47c5dee55815467bac7f51a4a296f516]
# to [4520334445706e61c42a20ae0810c84127698362]
#
# patch "packages/gaim/pidgin_2.0.1.bb"
# from [5e598d06fa4ddc75f63cfa53dc4ee315a83a2cc7]
# to [165e9139e682c9431865f04be900ab693ffd1e65]
#
# patch "packages/liba52/liba52_0.7.4.bb"
# from [7df043a82e64faf5bd4210fae09e5f7559118006]
# to [7f7b059a9705494a1b30354fd5a5e6dac4792ac2]
#
# patch "packages/linux/linux-omap1-2.6.20-omap1/defconfig.eabi"
# from [d6beab65c7e3e7c981b9a71c317fd2a5135ce4ba]
# to [e2137cd9a80871151826b887b4df6189f3f2df5b]
#
# patch "packages/linux/linux-rp-2.6.20/defconfig-collie"
# from [814a9b24546da3bf66682054878d9b889c303d64]
# to [53804a4fd6eda673edf99244c4c3c8ea0ed64a87]
#
# patch "packages/linux/linux-rp_2.6.20.bb"
# from [e1c102e405507247f70e6eb20c86f82e7d77f0c3]
# to [561a51a3e89dbf4ab4f14db0b87cec6a4498d0eb]
#
# patch "packages/linux/xanadux-ba-2.6_2.6.12.bb"
# from [b45479eb0d5baf8451ec82e7a314d50a13b445a6]
# to [5180cc040013cc627ba0dea2b34735f9d4fa0dd8]
#
# patch "packages/linux/xanadux-un-2.6_2.6.12.bb"
# from [b1126eb22ffa0d72291a165524d5f67b76fe1b32]
# to [a63c9825f09a1bef04ed41c2ab3d9783328c0776]
#
# patch "packages/qt/qt4-x11-free-4.3.0/0001-cross-compile.patch"
# from [baef2c973d3f167a15da5591f384f46ac97e9568]
# to [c3afeaba18e291233ac487a7a527fffb07d2af3d]
#
# patch "packages/qt/qt4-x11-free-4.3.0/0002-fix-resinit-declaration.patch"
# from [290ead1081e92cf5f040fa1f37108b10e466d853]
# to [183a0e33f58672eca181e9db1ccfc989c3713628]
#
# patch "packages/qt/qt4-x11-free-4.3.0/0003-no-tools.patch"
# from [24c14cb5bf5bc4d4041040de4d373f6e081101cb]
# to [e8f79a4c728622246743728bf0cfd8ec721edde0]
#
# patch "packages/qt/qt4-x11-free-4.3.0/0004-no-qmake.patch"
# from [5c958d83e74daad2e0496134d0f6d4ca3509b26e]
# to [8ba0dc5bb603a1fd15d67d8e65d077e0faede081]
#
# patch "packages/qt/qt4-x11-free-4.3.0/0005-fix-mkspecs.patch"
# from [be9c0987b2555dbe59c11e9ee4717394d28a23c6]
# to [4ac628818045f6790dafb35be445cd3989de25c2]
#
# patch "packages/qt/qt4-x11-free_4.3.0.bb"
# from [79e94ac05da362d387484479ed11780b5c0f05aa]
# to [60a4f320d3d48b00cb4e2bd307b381db3b12a98a]
#
# patch "packages/slugos-init/files/turnup"
# from [263b71d35ea2cbef39dcb15638db45ac0ce27ea8]
# to [2e05239eaf5a32bbf9737fb1febffb5bde474362]
#
# patch "packages/slugos-init/slugos-init_0.10.bb"
# from [aa68d65a96235652257f8f37678f8e5ef264258d]
# to [9415d4ba5a133d97c91c0528720853e763cd539b]
#
# patch "packages/wpa-supplicant/wpa-supplicant-0.5.inc"
# from [23e209561cafc60c7b82826e9e09d2a2c070e575]
# to [2122683c4f4b58f9716ecc268a1807bedb3c2bd4]
#
# patch "packages/wpa-supplicant/wpa-supplicant_0.5.5.bb"
# from [6a18ff35831159e4d3b395814464c7a224ebb656]
# to [6879fb107b2089dd63bb4da0a6241e2239109b25]
#
# patch "packages/wpa-supplicant/wpa-supplicant_0.5.7.bb"
# from [c9f51fde6a815bc8fdd0a7c70d27dd539588f0ba]
# to [04575e5e0d1662c7f57ebe91fc8172de61167e9f]
#
# set "packages/wpa-supplicant/files/functions.sh"
# attr "mtn:execute"
# value "true"
#
# set "packages/wpa-supplicant/files/ifupdown.sh"
# attr "mtn:execute"
# value "true"
#
============================================================
--- packages/qt/qt4-x11-free-4.1.2/cross-compile.patch baef2c973d3f167a15da5591f384f46ac97e9568
+++ packages/qt/qt4-x11-free-4.1.2/cross-compile.patch baef2c973d3f167a15da5591f384f46ac97e9568
@@ -0,0 +1,159 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-x11-opensource-src-4.1.1/configure~cross-compile
++++ qt-x11-opensource-src-4.1.1/configure
+@@ -534,7 +534,7 @@
+ UNKNOWN_ARG=yes
+ fi
+ ;;
+- -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk)
++ -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-crossarch)
+ VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+ shift
+ VAL=$1
+@@ -845,6 +845,9 @@
+ xplatform)
+ XPLATFORM="$VAL"
+ ;;
++ crossarch)
++ CROSSARCH="$VAL"
++ ;;
+ debug-and-release)
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+ CFG_DEBUG_RELEASE="$VAL"
+@@ -1698,131 +1701,7 @@
+ echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)"
+ fi
+
+-if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then
+- case "$CFG_EMBEDDED" in
+- x86)
+- ARCH=i386
+- ;;
+- x86_64)
+- ARCH=x86_64
+- ;;
+- ipaq|sharp)
+- ARCH=arm
+- ;;
+- *)
+- ARCH="$CFG_EMBEDDED"
+- ;;
+- esac
+-else
+- case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in
+- IRIX*:*:*)
+- ARCH=`uname -p`
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " SGI ($ARCH)"
+- fi
+- ;;
+- SunOS:5*:*)
+- case "$UNAME_MACHINE" in
+- sun4u)
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " Sun SPARC (sparc)"
+- fi
+- ARCH=sparc
+- ;;
+- i86pc)
+- case "$PLATFORM" in
+- *-64)
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " 64-bit AMD 80x86 (x86_64)"
+- fi
+- ARCH=x86_64
+- ;;
+- *)
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " 32-bit Intel 80x86 (i386)"
+- fi
+- ARCH=i386
+- ;;
+- esac
+- esac
+- ;;
+- Darwin:*:*)
+- case "$UNAME_MACHINE" in
+- Power?Macintosh)
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " 32-bit Apple PowerPC (powerpc)"
+- fi
+- ;;
+- x86)
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " 32-bit Intel 80x86 (i386)"
+- fi
+- ;;
+- esac
+- ARCH=macosx
+- ;;
+- AIX:*:00????????00)
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " 64-bit IBM PowerPC (powerpc)"
+- fi
+- ARCH=powerpc
+- ;;
+- HP-UX:*:9000*)
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " HP PA-RISC (parisc)"
+- fi
+- ARCH=parisc
+- ;;
+- *:*:i?86)
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " 32-bit Intel 80x86 (i386)"
+- fi
+- ARCH=i386
+- ;;
+- *:*:x86_64|*:*:amd64)
+- if [ "$PLATFORM" = "linux-g++-32" ]; then
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " 32 bit on 64-bit AMD 80x86 (i386)"
+- fi
+- ARCH=i386
+- else
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " 64-bit AMD 80x86 (x86_64)"
+- fi
+- ARCH=x86_64
+- fi
+- ;;
+- *:*:ppc)
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " 32-bit PowerPC (powerpc)"
+- fi
+- ARCH=powerpc
+- ;;
+- *:*:s390*)
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " IBM S/390 (s390)"
+- fi
+- ARCH=s390
+- ;;
+- *:*:*)
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " Trying '$UNAME_MACHINE'..."
+- fi
+- ARCH="$UNAME_MACHINE"
+- ;;
+- esac
+-fi
+-
+-if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " '$ARCH' is supported"
+- fi
+-else
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " '$ARCH' is unsupported, using 'generic'"
+- fi
+- ARCH=generic
+-fi
++ARCH="$CROSSARCH"
+
+ if [ "$OPT_VERBOSE" = "yes" ]; then
+ echo "System architecture: '$ARCH'"
============================================================
--- packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch be9c0987b2555dbe59c11e9ee4717394d28a23c6
+++ packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch be9c0987b2555dbe59c11e9ee4717394d28a23c6
@@ -0,0 +1,102 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-x11-opensource-src-4.1.1/mkspecs/linux-g++/qmake.conf~fix-qmakespec
++++ qt-x11-opensource-src-4.1.1/mkspecs/linux-g++/qmake.conf
+@@ -8,7 +8,7 @@
+ QT += core gui
+ QMAKE_INCREMENTAL_STYLE = sublib
+
+-QMAKE_CC = gcc
++QMAKE_CC = $(OE_QMAKE_CC)
+ QMAKE_LEX = flex
+ QMAKE_LEXFLAGS =
+ QMAKE_YACC = yacc
+@@ -16,19 +16,19 @@
+ QMAKE_YACCFLAGS_MANGLE = -p $base -b $base
+ QMAKE_YACC_HEADER = $base.tab.h
+ QMAKE_YACC_SOURCE = $base.tab.c
+-QMAKE_CFLAGS = -pipe
++QMAKE_CFLAGS = -pipe $(OE_QMAKE_CFLAGS)
+ QMAKE_CFLAGS_DEPS = -M
+ QMAKE_CFLAGS_WARN_ON = -Wall -W
+ QMAKE_CFLAGS_WARN_OFF = -w
+-QMAKE_CFLAGS_RELEASE = -O2
++QMAKE_CFLAGS_RELEASE = -O2
+ QMAKE_CFLAGS_DEBUG = -g
+ QMAKE_CFLAGS_SHLIB = -fPIC
+ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
+ QMAKE_CFLAGS_THREAD = -D_REENTRANT
+ QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden
+
+-QMAKE_CXX = g++
+-QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
++QMAKE_CXX = $(OE_QMAKE_CXX)
++QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
+ QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
+ QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
+@@ -41,37 +41,37 @@
+
+ QMAKE_INCDIR =
+ QMAKE_LIBDIR =
+-QMAKE_INCDIR_X11 = /usr/X11R6/include
+-QMAKE_LIBDIR_X11 = /usr/X11R6/lib
+-QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
+-QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
+-QMAKE_INCDIR_OPENGL = /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
++QMAKE_INCDIR_X11 =
++QMAKE_LIBDIR_X11 =
++QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT)
++QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT)
++QMAKE_INCDIR_OPENGL =
++QMAKE_LIBDIR_OPENGL =
+
+-QMAKE_LINK = g++
+-QMAKE_LINK_SHLIB = g++
+-QMAKE_LFLAGS =
++QMAKE_LINK = $(OE_QMAKE_LINK)
++QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
++QMAKE_LFLAGS = $(OE_QMAKE_LDFLAGS)
+ QMAKE_LFLAGS_RELEASE =
+ QMAKE_LFLAGS_DEBUG =
+ QMAKE_LFLAGS_SHLIB = -shared
+ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
+ QMAKE_LFLAGS_SONAME = -Wl,-soname,
+ QMAKE_LFLAGS_THREAD =
+-QMAKE_RPATH = -Wl,-rpath,
++QMAKE_RPATH = -Wl,-rpath-link,
+
+ QMAKE_LIBS =
+ QMAKE_LIBS_DYNLOAD = -ldl
+-QMAKE_LIBS_X11 = -lXext -lX11 -lm
+-QMAKE_LIBS_X11SM = -lSM -lICE
++QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
++QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
+ QMAKE_LIBS_NIS = -lnsl
+ QMAKE_LIBS_OPENGL = -lGLU -lGL
+ QMAKE_LIBS_OPENGL_QT = -lGL
+ QMAKE_LIBS_THREAD = -lpthread
+
+-QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
+-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
++QMAKE_MOC = $(OE_QMAKE_MOC)
++QMAKE_UIC = $(OE_QMAKE_UIC)
+
+-QMAKE_AR = ar cqs
++QMAKE_AR = $(OE_QMAKE_AR) cqs
+ QMAKE_RANLIB =
+
+ QMAKE_TAR = tar -cf
+@@ -83,7 +83,7 @@
+ QMAKE_MOVE = mv -f
+ QMAKE_DEL_FILE = rm -f
+ QMAKE_DEL_DIR = rmdir
+-QMAKE_STRIP = strip
++QMAKE_STRIP = $(OE_QMAKE_STRIP)
+ QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+ QMAKE_CHK_DIR_EXISTS = test -d
+ QMAKE_MKDIR = mkdir -p
============================================================
--- packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch 290ead1081e92cf5f040fa1f37108b10e466d853
+++ packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch 290ead1081e92cf5f040fa1f37108b10e466d853
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-x11-opensource-src-4.1.1/src/qt3support/network/q3dns.cpp~fix-resinit-declaration
++++ qt-x11-opensource-src-4.1.1/src/qt3support/network/q3dns.cpp
+@@ -30,7 +30,7 @@
+ # include <netinet/in.h>
+ # include <arpa/nameser.h>
+ # include <resolv.h>
+-extern "C" int res_init();
++extern "C" int res_init() throw();
+ #endif
+
+ // POSIX Large File Support redefines open -> open64
============================================================
--- packages/qt/qt4-x11-free-4.1.2/no-qmake.patch 5c958d83e74daad2e0496134d0f6d4ca3509b26e
+++ packages/qt/qt4-x11-free-4.1.2/no-qmake.patch 5c958d83e74daad2e0496134d0f6d4ca3509b26e
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-x11-opensource-src-4.1.1/configure~no-qmake
++++ qt-x11-opensource-src-4.1.1/configure
+@@ -2548,7 +2548,7 @@
+ fi
+
+ # build qmake
+-if true; then ###[ '!' -f "$outpa%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rfa1c000d2eb11e81b0552935ffbdfcbf497dde8a -r8b37dea089f02d115ec3e3af14478ea8264ad822
#
#
# no changes
#
More information about the Openembedded-commits
mailing list