rev 12711 - in trunk/packages/qt-x11-free/debian: . patches
Sune Vuorela
pusling-guest at alioth.debian.org
Sun Nov 23 20:44:09 UTC 2008
Author: pusling-guest
Date: 2008-11-23 20:44:09 +0000 (Sun, 23 Nov 2008)
New Revision: 12711
Added:
trunk/packages/qt-x11-free/debian/patches/71_sparc_only_-O1.diff
Modified:
trunk/packages/qt-x11-free/debian/changelog
trunk/packages/qt-x11-free/debian/patches/series
trunk/packages/qt-x11-free/debian/rules
Log:
Build with -O1 on sparc as something is broken here. (Closes: #490999)
Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog 2008-11-23 20:21:05 UTC (rev 12710)
+++ trunk/packages/qt-x11-free/debian/changelog 2008-11-23 20:44:09 UTC (rev 12711)
@@ -1,3 +1,9 @@
+qt-x11-free (3:3.3.8b-6) unstable; urgency=low
+
+ * Build with -O1 on sparc as something is broken here. (Closes: #490999)
+
+ -- Sune Vuorela <debian at pusling.com> Sun, 23 Nov 2008 21:42:03 +0100
+
qt-x11-free (3:3.3.8b-5) unstable; urgency=medium
+++ Changes by Modestas Vainius:
Added: trunk/packages/qt-x11-free/debian/patches/71_sparc_only_-O1.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/71_sparc_only_-O1.diff (rev 0)
+++ trunk/packages/qt-x11-free/debian/patches/71_sparc_only_-O1.diff 2008-11-23 20:44:09 UTC (rev 12711)
@@ -0,0 +1,202 @@
+--- /dev/null
++++ b/mkspecs/linux-g++-sparc/qmake.conf
+@@ -0,0 +1,89 @@
++#
++#
++# qmake configuration for linux-g++
++#
++
++MAKEFILE_GENERATOR = UNIX
++TEMPLATE = app
++CONFIG += qt warn_on release incremental link_prl thread
++QMAKE_INCREMENTAL_STYLE = sublib
++
++QMAKE_CC = gcc
++QMAKE_LEX = flex
++QMAKE_LEXFLAGS =
++QMAKE_YACC = yacc
++QMAKE_YACCFLAGS = -d
++QMAKE_YACCFLAGS_MANGLE = -p $base -b $base
++QMAKE_YACC_HEADER = $base.tab.h
++QMAKE_YACC_SOURCE = $base.tab.c
++QMAKE_CFLAGS = -pipe -g
++QMAKE_CFLAGS_DEPS = -M
++QMAKE_CFLAGS_WARN_ON = -Wall -W
++QMAKE_CFLAGS_WARN_OFF = -w
++QMAKE_CFLAGS_RELEASE = -O1
++QMAKE_CFLAGS_DEBUG = -O0
++QMAKE_CFLAGS_SHLIB = -fPIC
++QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
++QMAKE_CFLAGS_THREAD = -D_REENTRANT
++
++QMAKE_CXX = g++
++QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
++QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
++QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
++QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
++QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
++QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
++QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
++QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
++QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
++
++QMAKE_INCDIR =
++QMAKE_LIBDIR =
++QMAKE_INCDIR_X11 = /usr/X11R6/include
++QMAKE_LIBDIR_X11 = /usr/X11R6/lib
++QMAKE_INCDIR_QT = $(QTDIR)/include
++QMAKE_LIBDIR_QT = $(QTDIR)/lib
++QMAKE_INCDIR_OPENGL = /usr/X11R6/include
++QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
++
++QMAKE_LINK = g++
++QMAKE_LINK_SHLIB = g++
++QMAKE_LFLAGS =
++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 =
++
++QMAKE_LIBS =
++QMAKE_LIBS_DYNLOAD = -ldl
++QMAKE_LIBS_X11 = -lXext -lX11 -lm
++QMAKE_LIBS_X11SM = -lSM -lICE
++QMAKE_LIBS_NIS = -lnsl
++QMAKE_LIBS_QT = -lqt
++QMAKE_LIBS_QT_THREAD = -lqt-mt
++QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu
++QMAKE_LIBS_OPENGL_QT = -lGL -lXmu
++QMAKE_LIBS_THREAD = -lpthread
++
++QMAKE_MOC = $(QTDIR)/bin/moc
++QMAKE_UIC = $(QTDIR)/bin/uic
++
++QMAKE_AR = ar cqs
++QMAKE_RANLIB =
++
++QMAKE_TAR = tar -cf
++QMAKE_GZIP = gzip -9f
++
++QMAKE_COPY = cp -f
++QMAKE_COPY_FILE = $(COPY)
++QMAKE_COPY_DIR = $(COPY) -r
++QMAKE_MOVE = mv -f
++QMAKE_DEL_FILE = rm -f
++QMAKE_DEL_DIR = rmdir
++QMAKE_STRIP =
++QMAKE_STRIPFLAGS_LIB += --strip-unneeded
++QMAKE_CHK_DIR_EXISTS = test -d
++QMAKE_MKDIR = mkdir -p
+--- /dev/null
++++ b/mkspecs/linux-g++-sparc/qplatformdefs.h
+@@ -0,0 +1,107 @@
++#ifndef QPLATFORMDEFS_H
++#define QPLATFORMDEFS_H
++
++// Get Qt defines/settings
++
++#include "qglobal.h"
++
++// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
++
++// DNS system header files are a mess!
++// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
++// 'u_char' and includes <sys/types.h>. Now the problem is that
++// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
++// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
++#ifndef _BSD_SOURCE
++# define _BSD_SOURCE
++#endif
++
++// 1) need to reset default environment if _BSD_SOURCE is defined
++// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
++// 3) it seems older glibc need this to include the X/Open stuff
++#ifndef _GNU_SOURCE
++# define _GNU_SOURCE
++#endif
++
++#include <unistd.h>
++
++
++// We are hot - unistd.h should have turned on the specific APIs we requested
++
++
++#ifdef QT_THREAD_SUPPORT
++#include <pthread.h>
++#endif
++
++#include <dirent.h>
++#include <fcntl.h>
++#include <grp.h>
++#include <pwd.h>
++#include <signal.h>
++#include <dlfcn.h>
++
++#include <sys/types.h>
++#include <sys/ioctl.h>
++#include <sys/ipc.h>
++#include <sys/time.h>
++#include <sys/shm.h>
++#include <sys/socket.h>
++#include <sys/stat.h>
++#include <sys/wait.h>
++
++// DNS header files are not fully covered by X/Open specifications.
++// In particular nothing is said about res_* :/
++// Header files <netinet/in.h> and <arpa/nameser.h> are not included
++// by <resolv.h> on older versions of the GNU C library. Note that
++// <arpa/nameser.h> must be included before <resolv.h>.
++#include <netinet/in.h>
++#include <arpa/nameser.h>
++#include <resolv.h>
++
++
++#if !defined(QT_NO_COMPAT)
++#define QT_STATBUF struct stat
++#define QT_STATBUF4TSTAT struct stat
++#define QT_STAT ::stat
++#define QT_FSTAT ::fstat
++#define QT_STAT_REG S_IFREG
++#define QT_STAT_DIR S_IFDIR
++#define QT_STAT_MASK S_IFMT
++#define QT_STAT_LNK S_IFLNK
++#define QT_FILENO fileno
++#define QT_OPEN ::open
++#define QT_CLOSE ::close
++#define QT_LSEEK ::lseek
++#define QT_READ ::read
++#define QT_WRITE ::write
++#define QT_ACCESS ::access
++#define QT_GETCWD ::getcwd
++#define QT_CHDIR ::chdir
++#define QT_MKDIR ::mkdir
++#define QT_RMDIR ::rmdir
++#define QT_OPEN_RDONLY O_RDONLY
++#define QT_OPEN_WRONLY O_WRONLY
++#define QT_OPEN_RDWR O_RDWR
++#define QT_OPEN_CREAT O_CREAT
++#define QT_OPEN_TRUNC O_TRUNC
++#define QT_OPEN_APPEND O_APPEND
++#endif
++
++#define QT_SIGNAL_RETTYPE void
++#define QT_SIGNAL_ARGS int
++#define QT_SIGNAL_IGNORE SIG_IGN
++
++#if defined(__GLIBC__) && (__GLIBC__ >= 2)
++#define QT_SOCKLEN_T socklen_t
++#else
++#define QT_SOCKLEN_T int
++#endif
++
++#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
++#define QT_SNPRINTF ::snprintf
++#define QT_VSNPRINTF ::vsnprintf
++#endif
++
++#define QT_MITSHM
++
++#endif // QPLATFORMDEFS_H
Modified: trunk/packages/qt-x11-free/debian/patches/series
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/series 2008-11-23 20:21:05 UTC (rev 12710)
+++ trunk/packages/qt-x11-free/debian/patches/series 2008-11-23 20:44:09 UTC (rev 12711)
@@ -52,6 +52,7 @@
66_gcc-4.3_compile-fix.diff
68_use-lfbclient_not-lgds.diff
70_bad_typecast_amd64.diff
+71_sparc_only_-O1.diff
72_dont_trust_uname-m_use_dpkg-arch_instead.diff
73_configure_quilt_compat.diff
90_armeabi.diff
Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules 2008-11-23 20:21:05 UTC (rev 12710)
+++ trunk/packages/qt-x11-free/debian/rules 2008-11-23 20:44:09 UTC (rev 12711)
@@ -16,9 +16,13 @@
ifeq ($(DEB_HOST_ARCH_OS),hurd)
PLATFORM_ARG = hurd-g++
-else
+else #hurd
+ifeq($(DEB_HOST_ARCH),sparc)
+ PLATFORM_ARG = linux-g++-sparc
+else #sparc
PLATFORM_ARG = linux-g++
-endif
+endif # sparc
+endif #hurd
# quilt stuff
include /usr/share/quilt/quilt.make
More information about the pkg-kde-commits
mailing list