From e43d1ae2d91a188e8a0cfd49a6be8762bb5c6cf0 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 10 Sep 2012 17:45:51 -0500
Subject: Fix FTBFS on Linux from recent UUID enhancement

---
 mkspecs/linux-cxx/qmake.conf       | 4 ++--
 mkspecs/linux-ecc-64/qmake.conf    | 4 ++--
 mkspecs/linux-g++-32/qmake.conf    | 4 ++--
 mkspecs/linux-g++-64/qmake.conf    | 4 ++--
 mkspecs/linux-g++-sparc/qmake.conf | 4 ++--
 mkspecs/linux-g++/qmake.conf       | 4 ++--
 mkspecs/linux-icc/qmake.conf       | 4 ++--
 mkspecs/linux-kcc/qmake.conf       | 4 ++--
 mkspecs/linux-kylix/qmake.conf     | 4 ++--
 mkspecs/linux-pgcc/qmake.conf      | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf
index 9c48776..474021a 100644
--- a/mkspecs/linux-cxx/qmake.conf
+++ b/mkspecs/linux-cxx/qmake.conf
@@ -44,14 +44,14 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= cxx
 QMAKE_LINK_SHLIB	= cxx
-QMAKE_LFLAGS		=
+QMAKE_LFLAGS		= -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
diff --git a/mkspecs/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf
index e25d8ed..2e648d1 100644
--- a/mkspecs/linux-ecc-64/qmake.conf
+++ b/mkspecs/linux-ecc-64/qmake.conf
@@ -46,7 +46,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= ecpc
 QMAKE_LINK_SHLIB	= ecpc
-QMAKE_LFLAGS		=
+QMAKE_LFLAGS		= -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
@@ -55,7 +55,7 @@ QMAKE_LFLAGS_SONAME	= -Qoption,ld,-soname,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= -Qoption,ld,-rpath,
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
diff --git a/mkspecs/linux-g++-32/qmake.conf b/mkspecs/linux-g++-32/qmake.conf
index 44b1a33..353017e 100644
--- a/mkspecs/linux-g++-32/qmake.conf
+++ b/mkspecs/linux-g++-32/qmake.conf
@@ -48,7 +48,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
-QMAKE_LFLAGS		= -m32
+QMAKE_LFLAGS		= -m32 -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
@@ -57,7 +57,7 @@ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= -Wl,-rpath,
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf
index f891b3e..ecaa236 100644
--- a/mkspecs/linux-g++-64/qmake.conf
+++ b/mkspecs/linux-g++-64/qmake.conf
@@ -51,7 +51,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib64
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
-QMAKE_LFLAGS		=
+QMAKE_LFLAGS		= -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
@@ -60,7 +60,7 @@ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= -Wl,-rpath,
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
diff --git a/mkspecs/linux-g++-sparc/qmake.conf b/mkspecs/linux-g++-sparc/qmake.conf
index d790159..327534f 100644
--- a/mkspecs/linux-g++-sparc/qmake.conf
+++ b/mkspecs/linux-g++-sparc/qmake.conf
@@ -48,7 +48,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
-QMAKE_LFLAGS		=
+QMAKE_LFLAGS		= -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
@@ -57,7 +57,7 @@ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		=
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
diff --git a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf
index 64caaeb..3cf28be 100644
--- a/mkspecs/linux-g++/qmake.conf
+++ b/mkspecs/linux-g++/qmake.conf
@@ -48,7 +48,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
-QMAKE_LFLAGS		=
+QMAKE_LFLAGS		= -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
@@ -57,7 +57,7 @@ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= -Wl,-rpath,
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index 7a31515..9b67c05 100644
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -46,7 +46,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= icpc
 QMAKE_LINK_SHLIB	= icpc
-QMAKE_LFLAGS		=
+QMAKE_LFLAGS		= -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
@@ -55,7 +55,7 @@ QMAKE_LFLAGS_SONAME	= -Qoption,ld,-soname,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= -Qoption,ld,-rpath,
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf
index dae60f6..12f067e 100644
--- a/mkspecs/linux-kcc/qmake.conf
+++ b/mkspecs/linux-kcc/qmake.conf
@@ -53,7 +53,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= KCC
 QMAKE_LINK_SHLIB	= KCC
-QMAKE_LFLAGS		=
+QMAKE_LFLAGS		= -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	=
@@ -62,7 +62,7 @@ QMAKE_LFLAGS_SONAME	= --soname$$LITERAL_WHITESPACE
 QMAKE_LFLAGS_THREAD	= --thread_safe
 QMAKE_RPATH		= -rpath$$LITERAL_WHITESPACE
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
diff --git a/mkspecs/linux-kylix/qmake.conf b/mkspecs/linux-kylix/qmake.conf
index 2d4167a..2c9b124 100644
--- a/mkspecs/linux-kylix/qmake.conf
+++ b/mkspecs/linux-kylix/qmake.conf
@@ -45,7 +45,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= bc++
 QMAKE_LINK_SHLIB	= bc++
-QMAKE_LFLAGS		=
+QMAKE_LFLAGS		= -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	= -lv -ly
 QMAKE_LFLAGS_SHLIB	= -ltD -lTpd
@@ -54,7 +54,7 @@ QMAKE_LFLAGS_SONAME	= -lN
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		=
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -llibdl
 QMAKE_LIBS_X11		= -llibXext -llibX11 -llibm
 QMAKE_LIBS_X11SM	= -llibSM -llibICE
diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf
index f806bd1..7ff061e 100644
--- a/mkspecs/linux-pgcc/qmake.conf
+++ b/mkspecs/linux-pgcc/qmake.conf
@@ -46,7 +46,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= pgCC
 QMAKE_LINK_SHLIB	= pgCC
-QMAKE_LFLAGS		=
+QMAKE_LFLAGS		= -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
@@ -55,7 +55,7 @@ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= -R
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
-- 
cgit v1.2.3