Author: archaic Date: 2005-02-18 09:55:50 -0700 (Fri, 18 Feb 2005) New Revision: 839
Added: trunk/hlfs/qt-x11-free-3.3.4-uClibc-1.patch trunk/hlfs/xorg-6.8.2-nonow-1.patch Removed: trunk/qt/qt-x11-free-3.3.4-uClibc-1.patch trunk/xorg/xorg-6.8.2-nonow-1.patch Log: Moved xorg and qt patches to hlfs dir. Copied: trunk/hlfs/qt-x11-free-3.3.4-uClibc-1.patch (from rev 838, trunk/qt/qt-x11-free-3.3.4-uClibc-1.patch) Copied: trunk/hlfs/xorg-6.8.2-nonow-1.patch (from rev 838, trunk/xorg/xorg-6.8.2-nonow-1.patch) Deleted: trunk/qt/qt-x11-free-3.3.4-uClibc-1.patch =================================================================== --- trunk/qt/qt-x11-free-3.3.4-uClibc-1.patch 2005-02-18 16:44:43 UTC (rev 838) +++ trunk/qt/qt-x11-free-3.3.4-uClibc-1.patch 2005-02-18 16:55:50 UTC (rev 839) @@ -1,22 +0,0 @@ -Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes) -Date: 2005-02-18 -Initial Package Version: 3.3.4 -Upstream Status: Not submitted -Origin: http://svn.exactcode.de/t2/trunk/package/base/uclibc/patches/\ - qt-uclibc.patch -Description: fenv.h does not exist in uClibc. - -diff -Naur qt-x11-free-3.3.4.orig/src/tools/qlocale.cpp qt-x11-free-3.3.4/src/tools/qlocale.cpp ---- qt-x11-free-3.3.4.orig/src/tools/qlocale.cpp 2005-01-21 17:16:05.000000000 +0000 -+++ qt-x11-free-3.3.4/src/tools/qlocale.cpp 2005-02-18 13:36:59.000000000 +0000 -@@ -55,6 +55,10 @@ - # undef INFINITY - #endif - -+#if defined(Q_OS_LINUX) && defined(__UCLIBC__) -+# undef Q_OS_LINUX -+#endif -+ - #ifdef Q_OS_LINUX - # include <fenv.h> - #endif Deleted: trunk/xorg/xorg-6.8.2-nonow-1.patch =================================================================== --- trunk/xorg/xorg-6.8.2-nonow-1.patch 2005-02-18 16:44:43 UTC (rev 838) +++ trunk/xorg/xorg-6.8.2-nonow-1.patch 2005-02-18 16:55:50 UTC (rev 839) @@ -1,57 +0,0 @@ -Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes) -Date: 2005-02-18 -Initial Package Version: 6.8.2 -Upstream Status: Not submitted - They already know -Origin: Gentoo - 9910_all_use-nonow-ldflag-for-hardenedgccspecs.patch -Description: Xorg won't work with 'ld -z now'. This adds -nonow to the -compile flags for Xorg. Need to add "#define HardenedGccSpecs YES" to -config/cf/host.def. - -Also see: -http://www.linuxfromscratch.org/hlfs/ - -diff -urN xc.orig/config/cf/Imake.rules xc/config/cf/Imake.rules ---- xc.orig/config/cf/Imake.rules 2004-08-13 10:21:43.000000000 -0700 -+++ xc/config/cf/Imake.rules 2004-10-11 01:58:56.556395456 -0700 -@@ -3493,6 +3493,10 @@ - #endif - #endif - -+#if defined(HardenedGccSpecs) && HardenedGccSpecs -+LDBIND_FLAGS = -nonow -+#endif -+ - /* - * DynamicModuleTarget - build a module to be dynamically loaded - */ -@@ -3502,7 +3506,7 @@ - @@\ - module: modlist @@\ - RemoveFile($@) @@\ -- $(CC) -o $@ $(SHLIBLDFLAGS) modlist @@\ -+ $(CC) -o $@ $(SHLIBLDFLAGS) -nostdlib $(LDBIND_FLAGS) modlist @@\ - @@\ - clean:: @@\ - RemoveFile(module) -@@ -3517,7 +3521,7 @@ - @@\ - module: deplist @@\ - RemoveFile($@) @@\ -- $(CC) -o $@ $(SHLIBLDFLAGS) modlist @@\ -+ $(CC) -o $@ $(SHLIBLDFLAGS) -nostdlib $(LDBIND_FLAGS) modlist @@\ - @@\ - clean:: @@\ - RemoveFile(module) -diff -urN xc.orig/programs/Xserver/Imakefile xc/programs/Xserver/Imakefile ---- xc.orig/programs/Xserver/Imakefile 2004-10-11 01:51:58.590935864 -0700 -+++ xc/programs/Xserver/Imakefile 2004-10-11 01:56:44.395486968 -0700 -@@ -686,6 +686,9 @@ - XCOMM - XCOMM Xorg Server - XCOMM -+#if defined(HardenedGccSpecs) && HardenedGccSpecs -+LOCAL_LDFLAGS += -nonow -+#endif - FBSUBDIR = fb - MFBSUBDIR = mfb - CFB8SUBDIR = cfb -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
